2 files changed, 86 insertions, 118 deletions

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs
index 2dbe237..16dd0b6 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs
@@ -105,7 +105,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 }
 
                 m_debugEnabled = groupsConfig.GetBoolean("XmlRpcDebugEnabled", true);
-
             }
 
             m_log.Info("[GROUPS-MESSAGING]: XmlRpcGroupsMessaging starting up");
@@ -123,7 +122,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-
             m_groupsModule = scene.RequestModuleInterface<IGroupsModule>();
 
             // No groups module, no groups messaging
@@ -164,13 +162,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             m_sceneList.Remove(scene);
         }
 
-
         public void Close()
         {
             if (!m_groupMessagingEnabled)
                 return;
 
-            if(m_debugEnabled) m_log.Debug("[GROUPS-MESSAGING]: Shutting down XmlRpcGroupsMessaging module.");
+            if (m_debugEnabled) m_log.Debug("[GROUPS-MESSAGING]: Shutting down XmlRpcGroupsMessaging module.");
 
             foreach (Scene scene in m_sceneList)
             {
@@ -222,19 +219,17 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             {
                 m_log.DebugFormat("[GROUPS-MESSAGING] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            DebugGridInstantMessage(msg);
+                DebugGridInstantMessage(msg);
             }
 
             // Incoming message from a group
             if ((msg.fromGroup == true) && 
-                ( (msg.dialog == (byte)InstantMessageDialog.SessionSend)
-                  || (msg.dialog == (byte)InstantMessageDialog.SessionAdd)
-                  || (msg.dialog == (byte)InstantMessageDialog.SessionDrop)
-                ))
+                ((msg.dialog == (byte)InstantMessageDialog.SessionSend)
+                 || (msg.dialog == (byte)InstantMessageDialog.SessionAdd)
+                 || (msg.dialog == (byte)InstantMessageDialog.SessionDrop)))
             {
                 ProcessMessageFromGroupSession(msg);
             }
-
         }
 
         private void ProcessMessageFromGroupSession(GridInstantMessage msg)
@@ -254,53 +249,52 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 case (byte)InstantMessageDialog.SessionSend:
                     if (!m_agentsInGroupSession.ContainsKey(msg.toAgentID)
                         && !m_agentsDroppedSession.ContainsKey(msg.toAgentID))
-            {
+                    {
                         // Agent not in session and hasn't dropped from session
                         // Add them to the session for now, and Invite them
                         AddAgentToGroupSession(msg.toAgentID, msg.imSessionID);
 
-                UUID toAgentID = new UUID(msg.toAgentID);
-                IClientAPI activeClient = GetActiveClient(toAgentID);
-                if (activeClient != null)
-                {
-                    UUID groupID = new UUID(msg.fromAgentID);
-
-                    GroupRecord groupInfo = m_groupsModule.GetGroupRecord(groupID);
-                    if (groupInfo != null)
-                    {
-                        if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] Sending chatterbox invite instant message");
-
-                        // Force? open the group session dialog???
-                        IEventQueue eq = activeClient.Scene.RequestModuleInterface<IEventQueue>();
-                        eq.ChatterboxInvitation(
-                            groupID
-                            , groupInfo.GroupName
-                            , new UUID(msg.fromAgentID)
-                            , msg.message, new UUID(msg.toAgentID)
-                            , msg.fromAgentName
-                            , msg.dialog
-                            , msg.timestamp
+                        UUID toAgentID = new UUID(msg.toAgentID);
+                        IClientAPI activeClient = GetActiveClient(toAgentID);
+                        if (activeClient != null)
+                        {
+                            UUID groupID = new UUID(msg.fromAgentID);
+
+                            GroupRecord groupInfo = m_groupsModule.GetGroupRecord(groupID);
+                            if (groupInfo != null)
+                            {
+                                if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] Sending chatterbox invite instant message");
+
+                                // Force? open the group session dialog???
+                                IEventQueue eq = activeClient.Scene.RequestModuleInterface<IEventQueue>();
+                                eq.ChatterboxInvitation(
+                                    groupID
+                                    , groupInfo.GroupName
+                                    , new UUID(msg.fromAgentID)
+                                    , msg.message, new UUID(msg.toAgentID)
+                                    , msg.fromAgentName
+                                    , msg.dialog
+                                    , msg.timestamp
                                     , msg.offline == 1
-                            , (int)msg.ParentEstateID
-                            , msg.Position
-                            , 1
-                            , new UUID(msg.imSessionID)
-                            , msg.fromGroup
-                            , Utils.StringToBytes(groupInfo.GroupName)
-                            );
-
-                        eq.ChatterBoxSessionAgentListUpdates(
-                            new UUID(groupID)
-                            , new UUID(msg.fromAgentID)
-                            , new UUID(msg.toAgentID)
-                            , false //canVoiceChat
-                            , false //isModerator
-                            , false //text mute
-                            );
-
+                                    , (int)msg.ParentEstateID
+                                    , msg.Position
+                                    , 1
+                                    , new UUID(msg.imSessionID)
+                                    , msg.fromGroup
+                                    , Utils.StringToBytes(groupInfo.GroupName)
+                                    );
+
+                                eq.ChatterBoxSessionAgentListUpdates(
+                                    new UUID(groupID)
+                                    , new UUID(msg.fromAgentID)
+                                    , new UUID(msg.toAgentID)
+                                    , false //canVoiceChat
+                                    , false //isModerator
+                                    , false //text mute
+                                    );
+                            }
+                        }
                     }
-                }
-            }
                     else if (!m_agentsDroppedSession.ContainsKey(msg.toAgentID))
                     {
                         // User hasn't dropped, so they're in the session, 
@@ -322,10 +316,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 default:
                     m_log.WarnFormat("[GROUPS-MESSAGING] I don't know how to proccess a {0} message.", ((InstantMessageDialog)msg.dialog).ToString());
                     break;
+            }
         }
-        }
-
-
 
         #endregion
 
@@ -333,16 +325,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         private void RemoveAgentFromGroupSession(Guid agentID, Guid sessionID)
         {
-            if( m_agentsInGroupSession.ContainsKey(sessionID) )
+            if (m_agentsInGroupSession.ContainsKey(sessionID))
             {
                 // If in session remove
-                if( m_agentsInGroupSession[sessionID].Contains(agentID) )
+                if (m_agentsInGroupSession[sessionID].Contains(agentID))
                 {
                     m_agentsInGroupSession[sessionID].Remove(agentID);
                 }
 
                 // If not in dropped list, add
-                if( !m_agentsDroppedSession[sessionID].Contains(agentID) )
+                if (!m_agentsDroppedSession[sessionID].Contains(agentID))
                 {
                     if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] Dropped {1} from session {0}", sessionID, agentID);
                     m_agentsDroppedSession[sessionID].Add(agentID);
@@ -356,13 +348,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             CreateGroupSessionTracking(sessionID);
 
             // If nessesary, remove from dropped list
-            if( m_agentsDroppedSession[sessionID].Contains(agentID) )
+            if (m_agentsDroppedSession[sessionID].Contains(agentID))
             {
                 m_agentsDroppedSession[sessionID].Remove(agentID);
             }
 
             // If nessesary, add to in session list
-            if( !m_agentsInGroupSession[sessionID].Contains(agentID) )
+            if (!m_agentsInGroupSession[sessionID].Contains(agentID))
             {
                 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] Added {1} to session {0}", sessionID, agentID);
                 m_agentsInGroupSession[sessionID].Add(agentID);
@@ -385,7 +377,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             {
                 m_log.DebugFormat("[GROUPS-MESSAGING] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            DebugGridInstantMessage(im);
+                DebugGridInstantMessage(im);
             }
 
             // Start group IM session
@@ -424,13 +416,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 SendMessageToGroup(im, groupID);
             }
         }
+
         #endregion
 
         private void SendMessageToGroup(GridInstantMessage im, UUID groupID)
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-
             foreach (GroupMembersData member in m_groupsModule.GroupMembersRequest(null, groupID))
             {
                 if (m_agentsDroppedSession[im.imSessionID].Contains(member.AgentID.Guid))
@@ -441,15 +433,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 }
 
                 // Copy Message
-            GridInstantMessage msg = new GridInstantMessage();
-            msg.imSessionID = im.imSessionID;
-            msg.fromAgentName = im.fromAgentName;
-            msg.message = im.message;
-            msg.dialog = im.dialog;
+                GridInstantMessage msg = new GridInstantMessage();
+                msg.imSessionID = im.imSessionID;
+                msg.fromAgentName = im.fromAgentName;
+                msg.message = im.message;
+                msg.dialog = im.dialog;
                 msg.offline = im.offline;
-            msg.ParentEstateID = im.ParentEstateID;
-            msg.Position = im.Position;
-            msg.RegionID = im.RegionID;
+                msg.ParentEstateID = im.ParentEstateID;
+                msg.Position = im.Position;
+                msg.RegionID = im.RegionID;
                 msg.binaryBucket = im.binaryBucket;
                 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
 
@@ -464,8 +456,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 {
                     // If they're not local, forward across the grid
                     if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] Delivering to {0} via Grid", member.AgentID);
-                m_msgTransferModule.SendInstantMessage(msg, delegate(bool success) { });
-            }
+                    m_msgTransferModule.SendInstantMessage(msg, delegate(bool success) { });
+                }
                 else
                 {
                     // Deliver locally, directly
@@ -488,24 +480,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             sessionMap.Add("type", OSD.FromInteger(0));
             sessionMap.Add("voice_enabled", OSD.FromBoolean(false));
 
-
             OSDMap bodyMap = new OSDMap(4);
             bodyMap.Add("session_id", OSD.FromUUID(groupID));
             bodyMap.Add("temp_session_id", OSD.FromUUID(groupID));
             bodyMap.Add("success", OSD.FromBoolean(true));
             bodyMap.Add("session_info", sessionMap);
 
-
             IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>();
 
             if (queue != null)
             {
                 queue.Enqueue(EventQueueHelper.buildEvent("ChatterBoxSessionStartReply", bodyMap), remoteClient.AgentId);
             }
-
         }
 
-
         private void DebugGridInstantMessage(GridInstantMessage im)
         {
             if (m_debugEnabled)
@@ -535,7 +523,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             foreach (Scene scene in m_sceneList)
             {
                 if (scene.Entities.ContainsKey(agentID) &&
-                        scene.Entities[agentID] is ScenePresence)
+                    scene.Entities[agentID] is ScenePresence)
                 {
                     ScenePresence user = (ScenePresence)scene.Entities[agentID];
                     if (!user.IsChildAgent)
@@ -546,7 +534,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     {
                         child = user.ControllingClient;
                     }
-    }
+                }
             }
 
             // If we didn't find a root, then just return whichever child we found, or null if none
@@ -555,5 +543,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         #endregion
     }
-
 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
index eb9f804..a2d506c 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
@@ -143,13 +143,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             if (m_msgTransferModule == null)
             {
-                    m_msgTransferModule = scene.RequestModuleInterface<IMessageTransferModule>();
+                m_msgTransferModule = scene.RequestModuleInterface<IMessageTransferModule>();
 
                 // No message transfer module, no notices, group invites, rejects, ejects, etc
-                    if (m_msgTransferModule == null)
+                if (m_msgTransferModule == null)
                 {
-                        m_groupsEnabled = false;
-                        m_log.Error("[GROUPS]: Could not get MessageTransferModule");
+                    m_groupsEnabled = false;
+                    m_log.Error("[GROUPS]: Could not get MessageTransferModule");
                     Close();
                     return;
                 }
@@ -157,7 +157,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             lock (m_sceneList)
             {
-                m_sceneList.Add(scene);
+                m_sceneList.Add(scene);
             }
 
             scene.EventManager.OnNewClient += OnNewClient;
@@ -178,7 +178,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             lock (m_sceneList)
             {
-                    m_sceneList.Remove(scene);
+                m_sceneList.Remove(scene);
             }
         }
 
@@ -313,16 +313,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 GroupName = "Unknown";
             }
 
-
             remote_client.SendGroupNameReply(GroupID, GroupName);
         }
 
-
         private void OnInstantMessage(IClientAPI remoteClient, GridInstantMessage im)
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-
             // Group invitations
             if ((im.dialog == (byte)InstantMessageDialog.GroupInvitationAccept) || (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline))
             {
@@ -334,7 +331,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 UUID fromAgentID = new UUID(im.fromAgentID);
                 if ((inviteInfo != null) && (fromAgentID == inviteInfo.AgentID))
                 {
-
                     // Accept
                     if (im.dialog == (byte)InstantMessageDialog.GroupInvitationAccept)
                     {
@@ -373,10 +369,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     {
                         if (m_debugEnabled) m_log.DebugFormat("[GROUPS] Received a reject invite notice.");
                         m_groupData.RemoveAgentToGroupInvite(inviteID);
-
                     }
-
-
                 }
             }
 
@@ -411,14 +404,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                         binBucket = binBucket.Remove(0, 14).Trim();
                         if (m_debugEnabled)
                         {
-                                m_log.WarnFormat("I don't understand a group notice binary bucket of: {0}", binBucket);
-        
-                                OSDMap binBucketOSD = (OSDMap)OSDParser.DeserializeLLSDXml(binBucket);
-                                
-                                foreach (string key in binBucketOSD.Keys)
-                                {
-                                    m_log.WarnFormat("{0}: {1}", key, binBucketOSD[key].ToString());
-                                }                     
+                            m_log.WarnFormat("I don't understand a group notice binary bucket of: {0}", binBucket);
+
+                            OSDMap binBucketOSD = (OSDMap)OSDParser.DeserializeLLSDXml(binBucket);
+                            
+                            foreach (string key in binBucketOSD.Keys)
+                            {
+                                m_log.WarnFormat("{0}: {1}", key, binBucketOSD[key].ToString());
+                            }                     
                         }
    
                         // treat as if no attachment
@@ -429,7 +422,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                         bucket[18] = 0; //dunno
                     }
 
-
                     m_groupData.AddGroupNotice(GroupID, NoticeID, im.fromAgentName, Subject, Message, bucket);
                     if (OnNewGroupNotice != null)
                     {
@@ -446,12 +438,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
                             msg.toAgentID = member.AgentID.Guid;
                             OutgoingInstantMessage(msg, member.AgentID);
-
                         }
                     }
-
-
-
                 }
             }
             
@@ -477,11 +465,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     UUID groupID = new UUID(im.fromAgentID);
                     ejectee.SendAgentDropGroup(groupID);
                 }
-
             }
-
-
-
         }
 
         private void OnGridInstantMessage(GridInstantMessage msg)
@@ -491,7 +475,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             // Trigger the above event handler
             OnInstantMessage(null, msg);
 
-
             // If a message from a group arrives here, it may need to be forwarded to a local client
             if (msg.fromGroup == true)
             {
@@ -501,17 +484,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     case (byte)InstantMessageDialog.GroupNotice:
                         UUID toAgentID = new UUID(msg.toAgentID);
                         IClientAPI localClient = GetActiveClient(toAgentID);
-                        if( localClient != null )
+                        if (localClient != null)
                         {
                             localClient.SendInstantMessage(msg);
                         }
                         break;
                 }
             }
-
         }
 
-
         #endregion
 
         #region IGroupsModule Members
@@ -570,8 +551,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             List<GroupMembersData> data = m_groupData.GetGroupMembers(groupID);
             if (m_debugEnabled)
             {
-                    foreach (GroupMembersData member in data)
-                    {
+                foreach (GroupMembersData member in data)
+                {
                     m_log.DebugFormat("[GROUPS] {0} {1}", member.AgentID, member.Title);
                 }
             }
@@ -588,8 +569,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             if (m_debugEnabled)
             {
-                    foreach (GroupRolesData member in data)
-                    {
+                foreach (GroupRolesData member in data)
+                {
                     m_log.DebugFormat("[GROUPS] {0} {1}", member.Title, member.Members);
                 }
             }
@@ -606,8 +587,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             if (m_debugEnabled)
             {
-                    foreach (GroupRoleMembersData member in data)
-                    {
+                foreach (GroupRoleMembersData member in data)
+                {
                     m_log.DebugFormat("[GROUPS] Av: {0}  Role: {1}", member.MemberID, member.RoleID);
                 }
             }