Update to recent group chat changes in libomv.

git-svn-id: https://radegast.googlecode.com/svn/trunk@609 f7a694da-4d33-11de-9ad6-1127a62b9fcd

diff --git a/Radegast/GUI/Consoles/ConferenceIMTabWindow.cs b/Radegast/GUI/Consoles/ConferenceIMTabWindow.cs
index b51dfa9..19bbf27 100644 (file)
--- a/Radegast/GUI/Consoles/ConferenceIMTabWindow.cs
+++ b/Radegast/GUI/Consoles/ConferenceIMTabWindow.cs
@@ -70,7 +70,10 @@ namespace Radegast
             netcom.ClientDisconnected += new EventHandler<DisconnectedEventArgs>(netcom_ClientDisconnected);
             instance.GlobalSettings.OnSettingChanged += new Settings.SettingChangedCallback(GlobalSettings_OnSettingChanged);
 
-            this.client.Self.ChatterBoxAcceptInvite(session);
+            if (!client.Self.GroupChatSessions.ContainsKey(session))
+            {
+                client.Self.ChatterBoxAcceptInvite(session);
+            }
 
             UpdateFontSize();
         }

diff --git a/Radegast/GUI/Consoles/GroupIMTabWindow.cs b/Radegast/GUI/Consoles/GroupIMTabWindow.cs
index 4501b9f..438a5cb 100644 (file)
--- a/Radegast/GUI/Consoles/GroupIMTabWindow.cs
+++ b/Radegast/GUI/Consoles/GroupIMTabWindow.cs
@@ -66,9 +66,12 @@ namespace Radegast
 
             // Callbacks
             RegisterClientEvents(client);
-            client.Self.RequestJoinGroupChat(session);
-
+            if (!client.Self.GroupChatSessions.ContainsKey(session))
+            {
+                client.Self.RequestJoinGroupChat(session);
+            }
             UpdateFontSize();
+            Load += new EventHandler(GroupIMTabWindow_Load);
         }
 
         private void RegisterClientEvents(GridClient client)
@@ -101,6 +104,11 @@ namespace Radegast
             RegisterClientEvents(client);
         }
 
+        void GroupIMTabWindow_Load(object sender, EventArgs e)
+        {
+            UpdateParticipantList();
+        }
+
         private void IMTabWindow_Disposed(object sender, EventArgs e)
         {
             if (instance.Netcom.IsLoggedIn)

diff --git a/Radegast/GUI/Dialogs/MainForm.cs b/Radegast/GUI/Dialogs/MainForm.cs
index 10f0667..325e221 100644 (file)
--- a/Radegast/GUI/Dialogs/MainForm.cs
+++ b/Radegast/GUI/Dialogs/MainForm.cs
@@ -730,8 +730,6 @@ namespace Radegast
                 link = "http://" + link;
             }
 
-            // http://maps.secondlife.com/secondlife/JADED/203/108/26
-
             Regex r = new Regex(@"^(http://(slurl\.com|maps\.secondlife\.com)/secondlife/|secondlife://)(?<region>[^/]+)/(?<x>\d+)/(?<y>\d+)(/(?<z>\d+))?",
                 RegexOptions.CultureInvariant | RegexOptions.ExplicitCapture | RegexOptions.IgnoreCase
                 );