Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups

Signed-off-by: Melanie <melanie@t-data.com>

OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs

@@ -28,30 +28,41 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+
+
 using log4net;
 using Mono.Addins;
 using Nini.Config;
+
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
+
 using OpenSim.Framework;
 using OpenSim.Region.CoreModules.Framework.EventQueue;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
+
 using Caps = OpenSim.Framework.Capabilities.Caps;
 
 namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class GroupsMessagingModule : ISharedRegionModule, IGroupsMessagingModule
+    public class GroupsMessagingModule : ISharedRegionModule
     {
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private List<Scene> m_sceneList = new List<Scene>();
 
         private IMessageTransferModule m_msgTransferModule = null;
 
-        private IGroupsServicesConnector m_groupData = null;
+        private IGroupsModule m_groupsModule = null;
+
+        // TODO: Move this off to the Groups Server
+        public Dictionary<Guid, List<Guid>> m_agentsInGroupSession = new Dictionary<Guid, List<Guid>>();
+        public Dictionary<Guid, List<Guid>> m_agentsDroppedSession = new Dictionary<Guid, List<Guid>>();
+
 
         // Config Options
         private bool m_groupMessagingEnabled = false;
@@ -97,12 +108,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         public void AddRegion(Scene scene)
         {
-            if (!m_groupMessagingEnabled)
+            // NoOp
-                return;
-            
-            scene.RegisterModuleInterface<IGroupsMessagingModule>(this);
         }
-        
         public void RegionLoaded(Scene scene)
         {
             if (!m_groupMessagingEnabled)
@@ -110,12 +117,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            m_groupData = scene.RequestModuleInterface<IGroupsServicesConnector>();
+            m_groupsModule = scene.RequestModuleInterface<IGroupsModule>();
 
             // No groups module, no groups messaging
-            if (m_groupData == null)
+            if (m_groupsModule == null)
             {
-                m_log.Error("[GROUPS-MESSAGING]: Could not get IGroupsServicesConnector, GroupsMessagingModule is now disabled.");
+                m_log.Error("[GROUPS-MESSAGING]: Could not get IGroupsModule, GroupsMessagingModule is now disabled.");
                 Close();
                 m_groupMessagingEnabled = false;
                 return;
@@ -137,7 +144,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             scene.EventManager.OnNewClient += OnNewClient;
             scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
-            scene.EventManager.OnClientLogin += OnClientLogin;
+
         }
 
         public void RemoveRegion(Scene scene)
@@ -165,7 +172,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             m_sceneList.Clear();
 
-            m_groupData = null;
+            m_groupsModule = null;
             m_msgTransferModule = null;
         }
 
@@ -190,84 +197,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         #endregion
 
-        /// <summary>
-        /// Not really needed, but does confirm that the group exists.
-        /// </summary>
-        public bool StartGroupChatSession(UUID agentID, UUID groupID)
-        {
-            if (m_debugEnabled)
-                m_log.DebugFormat("[GROUPS-MESSAGING]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-                
-            GroupRecord groupInfo = m_groupData.GetGroupRecord(agentID, groupID, null);
-
-            if (groupInfo != null)
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-        
-        public 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_groupData.GetGroupMembers(UUID.Zero, groupID))
-            {
-                if (m_groupData.hasAgentDroppedGroupChatSession(member.AgentID, groupID))
-                {
-                    // Don't deliver messages to people who have dropped this session
-                    if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: {0} has dropped session, not delivering to them", member.AgentID);
-                    continue;
-                }
-
-                // Copy Message
-                GridInstantMessage msg = new GridInstantMessage();
-                msg.imSessionID = groupID.Guid;
-                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.binaryBucket = im.binaryBucket;
-                msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
-
-                msg.fromAgentID = im.fromAgentID;
-                msg.fromGroup = true;
-
-                msg.toAgentID = member.AgentID.Guid;
-
-                IClientAPI client = GetActiveClient(member.AgentID);
-                if (client == null)
-                {
-                    // 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) { });
-                }
-                else
-                {
-                    // Deliver locally, directly
-                    if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Passing to ProcessMessageFromGroupSession to deliver to {0} locally", client.Name);
-                    ProcessMessageFromGroupSession(msg);
-                }
-            }
-        }
-        
         #region SimGridEventHandlers
 
-        void OnClientLogin(IClientAPI client)
-        {
-            if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: OnInstantMessage registered for {0}", client.Name);
-
-            
-        }
-
         private void OnNewClient(IClientAPI client)
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: OnInstantMessage registered for {0}", client.Name);
@@ -305,46 +236,42 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Session message from {0} going to agent {1}", msg.fromAgentName, msg.toAgentID);
 
-            UUID AgentID = new UUID(msg.fromAgentID);
-            UUID GroupID = new UUID(msg.imSessionID);
-
             switch (msg.dialog)
             {
                 case (byte)InstantMessageDialog.SessionAdd:
-                    m_groupData.AgentInvitedToGroupChatSession(AgentID, GroupID);
+                    AddAgentToGroupSession(msg.fromAgentID, msg.imSessionID);
                     break;
 
                 case (byte)InstantMessageDialog.SessionDrop:
-                    m_groupData.AgentDroppedFromGroupChatSession(AgentID, GroupID);
+                    RemoveAgentFromGroupSession(msg.fromAgentID, msg.imSessionID);
                     break;
 
                 case (byte)InstantMessageDialog.SessionSend:
-                    if (!m_groupData.hasAgentDroppedGroupChatSession(AgentID, GroupID)
+                    if (!m_agentsInGroupSession.ContainsKey(msg.toAgentID)
-                        && !m_groupData.hasAgentBeenInvitedToGroupChatSession(AgentID, GroupID)
+                        && !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
-                        m_groupData.AgentInvitedToGroupChatSession(AgentID, GroupID);
+                        AddAgentToGroupSession(msg.toAgentID, msg.imSessionID);
 
                         UUID toAgentID = new UUID(msg.toAgentID);
                         IClientAPI activeClient = GetActiveClient(toAgentID);
                         if (activeClient != null)
                         {
-                            GroupRecord groupInfo = m_groupData.GetGroupRecord(UUID.Zero, GroupID, 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???
-                                // and simultanously deliver the message, so we don't need to do a seperate client.SendInstantMessage(msg);
                                 IEventQueue eq = activeClient.Scene.RequestModuleInterface<IEventQueue>();
                                 eq.ChatterboxInvitation(
-                                    GroupID
+                                    groupID
                                     , groupInfo.GroupName
                                     , new UUID(msg.fromAgentID)
-                                    , msg.message
+                                    , msg.message, new UUID(msg.toAgentID)
-                                    , new UUID(msg.toAgentID)
                                     , msg.fromAgentName
                                     , msg.dialog
                                     , msg.timestamp
@@ -358,7 +285,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                                     );
 
                                 eq.ChatterBoxSessionAgentListUpdates(
-                                    new UUID(GroupID)
+                                    new UUID(groupID)
                                     , new UUID(msg.fromAgentID)
                                     , new UUID(msg.toAgentID)
                                     , false //canVoiceChat
@@ -368,7 +295,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                             }
                         }
                     }
-                    else if (!m_groupData.hasAgentDroppedGroupChatSession(AgentID, GroupID))
+                    else if (!m_agentsDroppedSession.ContainsKey(msg.toAgentID))
                     {
                         // User hasn't dropped, so they're in the session, 
                         // maybe we should deliver it.
@@ -394,8 +321,56 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         #endregion
 
-
         #region ClientEvents
+
+        private void RemoveAgentFromGroupSession(Guid agentID, Guid sessionID)
+        {
+            if (m_agentsInGroupSession.ContainsKey(sessionID))
+            {
+                // If in session remove
+                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_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Dropped {1} from session {0}", sessionID, agentID);
+                    m_agentsDroppedSession[sessionID].Add(agentID);
+                }
+            }
+        }
+
+        private void AddAgentToGroupSession(Guid agentID, Guid sessionID)
+        {
+            // Add Session Status if it doesn't exist for this session
+            CreateGroupSessionTracking(sessionID);
+
+            // If nessesary, remove from dropped list
+            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_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Added {1} to session {0}", sessionID, agentID);
+                m_agentsInGroupSession[sessionID].Add(agentID);
+            }
+        }
+
+        private void CreateGroupSessionTracking(Guid sessionID)
+        {
+            if (!m_agentsInGroupSession.ContainsKey(sessionID))
+            {
+                if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Creating session tracking for : {0}", sessionID);
+                m_agentsInGroupSession.Add(sessionID, new List<Guid>());
+                m_agentsDroppedSession.Add(sessionID, new List<Guid>());
+            }
+        }
+
         private void OnInstantMessage(IClientAPI remoteClient, GridInstantMessage im)
         {
             if (m_debugEnabled)
@@ -408,23 +383,21 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             // Start group IM session
             if ((im.dialog == (byte)InstantMessageDialog.SessionGroupStart))
             {
-                if (m_debugEnabled) m_log.InfoFormat("[GROUPS-MESSAGING]: imSessionID({0}) toAgentID({1})", im.imSessionID, im.toAgentID);
+                UUID groupID = new UUID(im.toAgentID);
-
-                UUID GroupID = new UUID(im.imSessionID);
-                UUID AgentID = new UUID(im.fromAgentID);
-
-                GroupRecord groupInfo = m_groupData.GetGroupRecord(UUID.Zero, GroupID, null);
 
+                GroupRecord groupInfo = m_groupsModule.GetGroupRecord(groupID);
                 if (groupInfo != null)
                 {
-                    m_groupData.AgentInvitedToGroupChatSession(AgentID, GroupID);
+                    if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Start Group Session for {0}", groupInfo.GroupName);
 
-                    ChatterBoxSessionStartReplyViaCaps(remoteClient, groupInfo.GroupName, GroupID);
+                    AddAgentToGroupSession(im.fromAgentID, im.imSessionID);
+
+                    ChatterBoxSessionStartReplyViaCaps(remoteClient, groupInfo.GroupName, groupID);
 
                     IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>();
                     queue.ChatterBoxSessionAgentListUpdates(
-                        GroupID
+                        new UUID(groupID)
-                        , AgentID
+                        , new UUID(im.fromAgentID)
                         , new UUID(im.toAgentID)
                         , false //canVoiceChat
                         , false //isModerator
@@ -436,21 +409,64 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             // Send a message from locally connected client to a group
             if ((im.dialog == (byte)InstantMessageDialog.SessionSend))
             {
-                UUID GroupID = new UUID(im.imSessionID);
+                UUID groupID = new UUID(im.toAgentID);
-                UUID AgentID = new UUID(im.fromAgentID);
 
-                if (m_debugEnabled) 
+                if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Send message to session for group {0} with session ID {1}", groupID, im.imSessionID.ToString());
-                    m_log.DebugFormat("[GROUPS-MESSAGING]: Send message to session for group {0} with session ID {1}", GroupID, im.imSessionID.ToString());
 
-                //If this agent is sending a message, then they want to be in the session
+                SendMessageToGroup(im, groupID);
-                m_groupData.AgentInvitedToGroupChatSession(AgentID, GroupID);
-
-                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.ContainsKey(im.imSessionID) || m_agentsDroppedSession[im.imSessionID].Contains(member.AgentID.Guid))
+                {
+                    // Don't deliver messages to people who have dropped this session
+                    if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: {0} has dropped session, not delivering to them", member.AgentID);
+                    continue;
+                }
+
+                // Copy Message
+                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.binaryBucket = im.binaryBucket;
+                msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
+
+                // Updat Pertinate fields to make it a "group message"
+                msg.fromAgentID = groupID.Guid;
+                msg.fromGroup = true;
+
+                msg.toAgentID = member.AgentID.Guid;
+
+                IClientAPI client = GetActiveClient(member.AgentID);
+                if (client == null)
+                {
+                    // 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) { });
+                }
+                else
+                {
+                    // Deliver locally, directly
+                    if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Passing to ProcessMessageFromGroupSession to deliver to {0} locally", client.Name);
+                    ProcessMessageFromGroupSession(msg);
+                }
+            }
+        }
+
         void ChatterBoxSessionStartReplyViaCaps(IClientAPI remoteClient, string groupName, UUID groupID)
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
@@ -502,8 +518,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         /// </summary>
         private IClientAPI GetActiveClient(UUID agentID)
         {
-            if (m_debugEnabled) m_log.WarnFormat("[GROUPS-MESSAGING]: Looking for local client {0}", agentID);
-
             IClientAPI child = null;
 
             // Try root avatar first
@@ -515,26 +529,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     ScenePresence user = (ScenePresence)scene.Entities[agentID];
                     if (!user.IsChildAgent)
                     {
-                        if (m_debugEnabled) m_log.WarnFormat("[GROUPS-MESSAGING]: Found root agent for client : {0}", user.ControllingClient.Name);
                         return user.ControllingClient;
                     }
                     else
                     {
-                        if (m_debugEnabled) m_log.WarnFormat("[GROUPS-MESSAGING]: Found child agent for client : {0}", user.ControllingClient.Name);
                         child = user.ControllingClient;
                     }
                 }
             }
 
             // If we didn't find a root, then just return whichever child we found, or null if none
-            if (child == null)
-            {
-                if (m_debugEnabled) m_log.WarnFormat("[GROUPS-MESSAGING]: Could not find local client for agent : {0}", agentID);
-            }
-            else
-            {
-                if (m_debugEnabled) m_log.WarnFormat("[GROUPS-MESSAGING]: Returning child agent for client : {0}", child.Name);
-            }
             return child;
         }
 

OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs

@@ -176,6 +176,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             scene.EventManager.OnNewClient += OnNewClient;
             scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
+
             // The InstantMessageModule itself doesn't do this, 
             // so lets see if things explode if we don't do it
             // scene.EventManager.OnClientClosed += OnClientClosed;
@@ -509,7 +510,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 IClientAPI ejectee = GetActiveClient(ejecteeID);
                 if (ejectee != null)
                 {
-                    UUID groupID = new UUID(im.imSessionID);
+                    UUID groupID = new UUID(im.fromAgentID);
                     ejectee.SendAgentDropGroup(groupID);
                 }
             }

OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs

@@ -71,12 +71,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         void AddGroupNotice(UUID RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, byte[] binaryBucket);
         GroupNoticeInfo GetGroupNotice(UUID RequestingAgentID, UUID noticeID);
         List<GroupNoticeData> GetGroupNotices(UUID RequestingAgentID, UUID GroupID);
-
-        void ResetAgentGroupChatSessions(UUID agentID);
-        bool hasAgentBeenInvitedToGroupChatSession(UUID agentID, UUID groupID);
-        bool hasAgentDroppedGroupChatSession(UUID agentID, UUID groupID);
-        void AgentDroppedFromGroupChatSession(UUID agentID, UUID groupID);
-        void AgentInvitedToGroupChatSession(UUID agentID, UUID groupID);
     }
 
     public class GroupInviteInfo

OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs

@@ -55,9 +55,6 @@ using OpenSim.Services.Interfaces;
  * UserID -> Group -> ActiveGroup
  * + GroupID
  * 
- * UserID -> GroupSessionDropped -> GroupID
- * UserID -> GroupSessionInvited -> GroupID
- * 
  * UserID -> GroupMember -> GroupID
  * + SelectedRoleID [UUID]
  * + AcceptNotices  [bool]
@@ -66,7 +63,6 @@ using OpenSim.Services.Interfaces;
  *
  * UserID -> GroupRole[GroupID] -> RoleID
  * 
- * 
  * GroupID -> Group -> GroupName 
  * + Charter
  * + ShowInList
@@ -163,13 +159,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         private bool m_connectorEnabled = false;
 
-        private string m_groupsServerURI = string.Empty;
+        private string m_serviceURL = string.Empty;
 
         private bool m_debugEnabled = false;
 
-        private ExpiringCache<string, OSDMap> m_memoryCache;
-        private int m_cacheTimeout = 30;
-
         // private IUserAccountService m_accountService = null;
         
 
@@ -206,33 +199,17 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     return;
                 }
 
-                m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]: Initializing {0}", this.Name);
+                m_log.InfoFormat("[GROUPS-CONNECTOR]: Initializing {0}", this.Name);
 
-                m_groupsServerURI = groupsConfig.GetString("GroupsServerURI", string.Empty);
+                m_serviceURL = groupsConfig.GetString("XmlRpcServiceURL", string.Empty);
-                if ((m_groupsServerURI == null) ||
+                if ((m_serviceURL == null) ||
-                    (m_groupsServerURI == string.Empty))
+                    (m_serviceURL == string.Empty))
                 {
-                    m_log.ErrorFormat("Please specify a valid Simian Server for GroupsServerURI in OpenSim.ini, [Groups]");
+                    m_log.ErrorFormat("Please specify a valid Simian Server URL for XmlRpcServiceURL in OpenSim.ini, [Groups]");
                     m_connectorEnabled = false;
                     return;
                 }
 
-
-                m_cacheTimeout = groupsConfig.GetInt("GroupsCacheTimeout", 30);
-                if (m_cacheTimeout == 0)
-                {
-                    m_log.WarnFormat("[SIMIAN-GROUPS-CONNECTOR] Groups Cache Disabled.");
-                }
-                else
-                {
-                    m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] Groups Cache Timeout set to {0}.", m_cacheTimeout);
-                }
-
-                
-
-                m_memoryCache = new ExpiringCache<string,OSDMap>();
-                
-
                 // If we got all the config options we need, lets start'er'up
                 m_connectorEnabled = true;
 
@@ -243,7 +220,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         public void Close()
         {
-            m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]: Closing {0}", this.Name);
+            m_log.InfoFormat("[GROUPS-CONNECTOR]: Closing {0}", this.Name);
         }
 
         public void AddRegion(OpenSim.Region.Framework.Scenes.Scene scene)
@@ -676,7 +653,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             };
 
 
-            OSDMap response = CachedPostRequest(requestArgs);
+            OSDMap response = WebUtil.PostToService(m_serviceURL, requestArgs);
             if (response["Success"].AsBoolean() && response["Entries"] is OSDArray)
             {
                 OSDArray entryArray = (OSDArray)response["Entries"];
@@ -1021,52 +998,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         }
         #endregion
 
-        #region GroupSessionTracking
-
-        public void ResetAgentGroupChatSessions(UUID agentID)
-        {
-            Dictionary<string, OSDMap> agentSessions;
-
-            if (SimianGetGenericEntries(agentID, "GroupSessionDropped", out agentSessions))
-            {
-                foreach (string GroupID in agentSessions.Keys)
-                {
-                    SimianRemoveGenericEntry(agentID, "GroupSessionDropped", GroupID);
-                }
-            }
-
-            if (SimianGetGenericEntries(agentID, "GroupSessionInvited", out agentSessions))
-            {
-                foreach (string GroupID in agentSessions.Keys)
-                {
-                    SimianRemoveGenericEntry(agentID, "GroupSessionInvited", GroupID);
-                }
-            }
-        }
-
-        public bool hasAgentDroppedGroupChatSession(UUID agentID, UUID groupID)
-        {
-            OSDMap session;
-            return SimianGetGenericEntry(agentID, "GroupSessionDropped", groupID.ToString(), out session);
-        }
-
-        public void AgentDroppedFromGroupChatSession(UUID agentID, UUID groupID)
-        {
-            SimianAddGeneric(agentID, "GroupSessionDropped", groupID.ToString(), new OSDMap());
-        }
-
-        public void AgentInvitedToGroupChatSession(UUID agentID, UUID groupID)
-        {
-            SimianAddGeneric(agentID, "GroupSessionInvited", groupID.ToString(), new OSDMap());
-        }
-
-        public bool hasAgentBeenInvitedToGroupChatSession(UUID agentID, UUID groupID)
-        {
-            OSDMap session;
-            return SimianGetGenericEntry(agentID, "GroupSessionDropped", groupID.ToString(), out session);
-        }
-
-        #endregion
 
         private void EnsureRoleNotSelectedByMember(UUID groupID, UUID roleID, UUID userID)
         {
@@ -1105,7 +1036,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             };
 
 
-            OSDMap Response = CachedPostRequest(RequestArgs);
+            OSDMap Response = WebUtil.PostToService(m_serviceURL, RequestArgs);
             if (Response["Success"].AsBoolean())
             {
                 return true;
@@ -1132,7 +1063,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             };
 
 
-            OSDMap Response = CachedPostRequest(RequestArgs);
+            OSDMap Response = WebUtil.PostToService(m_serviceURL, RequestArgs);
             if (Response["Success"].AsBoolean() && Response["Entries"] is OSDArray)
             {
                 OSDArray entryArray = (OSDArray)Response["Entries"];
@@ -1172,7 +1103,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             };
 
 
-            OSDMap Response = CachedPostRequest(RequestArgs);
+            OSDMap Response = WebUtil.PostToService(m_serviceURL, RequestArgs);
             if (Response["Success"].AsBoolean() && Response["Entries"] is OSDArray)
             {
                 OSDArray entryArray = (OSDArray)Response["Entries"];
@@ -1213,7 +1144,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             };
 
 
-            OSDMap Response = CachedPostRequest(RequestArgs);
+            OSDMap Response = WebUtil.PostToService(m_serviceURL, RequestArgs);
             if (Response["Success"].AsBoolean() && Response["Entries"] is OSDArray)
             {
                 OSDArray entryArray = (OSDArray)Response["Entries"];
@@ -1253,7 +1184,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             
 
 
-            OSDMap response = CachedPostRequest(requestArgs);
+            OSDMap response = WebUtil.PostToService(m_serviceURL, requestArgs);
             if (response["Success"].AsBoolean() && response["Entries"] is OSDArray)
             {
                 maps = new Dictionary<string, OSDMap>();
@@ -1291,7 +1222,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
 
 
-            OSDMap response = CachedPostRequest(requestArgs);
+            OSDMap response = WebUtil.PostToService(m_serviceURL, requestArgs);
             if (response["Success"].AsBoolean() && response["Entries"] is OSDArray)
             {
                 maps = new Dictionary<UUID, OSDMap>();
@@ -1329,7 +1260,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             };
 
 
-            OSDMap response = CachedPostRequest(requestArgs);
+            OSDMap response = WebUtil.PostToService(m_serviceURL, requestArgs);
             if (response["Success"].AsBoolean())
             {
                 return true;
@@ -1341,49 +1272,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             }
         }
         #endregion
-
-        #region CheesyCache
-        OSDMap CachedPostRequest(NameValueCollection requestArgs)
-        {
-            // Immediately forward the request if the cache is disabled.
-            if (m_cacheTimeout == 0)
-            {
-                return WebUtil.PostToService(m_groupsServerURI, requestArgs);
-            }
-
-            // Check if this is an update or a request
-            if ( requestArgs["RequestMethod"] == "RemoveGeneric"
-                || requestArgs["RequestMethod"] == "AddGeneric"
-                )
-
-            {
-                // Any and all updates cause the cache to clear
-                m_memoryCache.Clear();
-
-                // Send update to server, return the response without caching it
-                return WebUtil.PostToService(m_groupsServerURI, requestArgs);
-
-            }
-
-            // If we're not doing an update, we must be requesting data
-
-            // Create the cache key for the request and see if we have it cached
-            string CacheKey = WebUtil.BuildQueryString(requestArgs);
-            OSDMap response = null;
-            if (!m_memoryCache.TryGetValue(CacheKey, out response))
-            {
-                // if it wasn't in the cache, pass the request to the Simian Grid Services 
-                response = WebUtil.PostToService(m_groupsServerURI, requestArgs);
-
-                // and cache the response
-                m_memoryCache.AddOrUpdate(CacheKey, response, TimeSpan.FromSeconds(m_cacheTimeout));
-            }
-
-            // return cached response
-            return response;
-        }
-        #endregion
-
     }
 
 }

OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs

@@ -29,7 +29,6 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Text;
 
 using Nwc.XmlRpc;
 
@@ -62,7 +61,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         private bool m_connectorEnabled = false;
 
-        private string m_groupsServerURI = string.Empty;
+        private string m_serviceURL = string.Empty;
 
         private bool m_disableKeepAlive = false;
 
@@ -71,16 +70,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         private IUserAccountService m_accountService = null;
         
-        private ExpiringCache<string, XmlRpcResponse> m_memoryCache;
-        private int m_cacheTimeout = 30;
-
-        // Used to track which agents are have dropped from a group chat session
-        // Should be reset per agent, on logon
-        // TODO: move this to Flotsam XmlRpc Service
-        // SessionID, List<AgentID>
-        private Dictionary<UUID, List<UUID>> m_groupsAgentsDroppedFromChatSession = new Dictionary<UUID, List<UUID>>();
-        private Dictionary<UUID, List<UUID>> m_groupsAgentsInvitedToChatSession = new Dictionary<UUID, List<UUID>>();
-
 
         #region IRegionModuleBase Members
 
@@ -115,13 +104,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     return;
                 }
 
-                m_log.InfoFormat("[XMLRPC-GROUPS-CONNECTOR]: Initializing {0}", this.Name);
+                m_log.InfoFormat("[GROUPS-CONNECTOR]: Initializing {0}", this.Name);
 
-                m_groupsServerURI = groupsConfig.GetString("GroupsServerURI", string.Empty);
+                m_serviceURL = groupsConfig.GetString("XmlRpcServiceURL", string.Empty);
-                if ((m_groupsServerURI == null) ||
+                if ((m_serviceURL == null) ||
-                    (m_groupsServerURI == string.Empty))
+                    (m_serviceURL == string.Empty))
                 {
-                    m_log.ErrorFormat("Please specify a valid URL for GroupsServerURI in OpenSim.ini, [Groups]");
+                    m_log.ErrorFormat("Please specify a valid URL for XmlRpcServiceURL in OpenSim.ini, [Groups]");
                     m_connectorEnabled = false;
                     return;
                 }
@@ -132,25 +121,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 m_groupWriteKey = groupsConfig.GetString("XmlRpcServiceWriteKey", string.Empty);
 
                 
-                m_cacheTimeout = groupsConfig.GetInt("GroupsCacheTimeout", 30);
+
-                if (m_cacheTimeout == 0)
-                {
-                    m_log.WarnFormat("[XMLRPC-GROUPS-CONNECTOR]: Groups Cache Disabled.");
-                }
-                else
-                {
-                    m_log.InfoFormat("[XMLRPC-GROUPS-CONNECTOR]: Groups Cache Timeout set to {0}.", m_cacheTimeout);
-                }
 
                 // If we got all the config options we need, lets start'er'up
-                m_memoryCache = new ExpiringCache<string, XmlRpcResponse>();
                 m_connectorEnabled = true;
             }
         }
 
         public void Close()
         {
-            m_log.InfoFormat("[XMLRPC-GROUPS-CONNECTOR]: Closing {0}", this.Name);
+            m_log.InfoFormat("[GROUPS-CONNECTOR]: Closing {0}", this.Name);
         }
 
         public void AddRegion(OpenSim.Region.Framework.Scenes.Scene scene)
@@ -776,69 +756,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             XmlRpcCall(requestingAgentID, "groups.addGroupNotice", param);
         }
-
-
-
-        #endregion
-
-        #region GroupSessionTracking
-
-        public void ResetAgentGroupChatSessions(UUID agentID)
-        {
-            foreach (List<UUID> agentList in m_groupsAgentsDroppedFromChatSession.Values)
-            {
-                agentList.Remove(agentID);
-            }
-        }
-
-        public bool hasAgentBeenInvitedToGroupChatSession(UUID agentID, UUID groupID)
-        {
-            // If we're  tracking this group, and we can find them in the tracking, then they've been invited
-            return m_groupsAgentsInvitedToChatSession.ContainsKey(groupID)
-                && m_groupsAgentsInvitedToChatSession[groupID].Contains(agentID);
-        }
-
-        public bool hasAgentDroppedGroupChatSession(UUID agentID, UUID groupID)
-        {
-            // If we're tracking drops for this group, 
-            // and we find them, well... then they've dropped
-            return m_groupsAgentsDroppedFromChatSession.ContainsKey(groupID) 
-                && m_groupsAgentsDroppedFromChatSession[groupID].Contains(agentID);
-        }
-
-        public void AgentDroppedFromGroupChatSession(UUID agentID, UUID groupID)
-        {
-            if (m_groupsAgentsDroppedFromChatSession.ContainsKey(groupID))
-            {
-                // If not in dropped list, add
-                if (!m_groupsAgentsDroppedFromChatSession[groupID].Contains(agentID))
-                {
-                    m_groupsAgentsDroppedFromChatSession[groupID].Add(agentID);
-                }
-            }
-        }
-
-        public void AgentInvitedToGroupChatSession(UUID agentID, UUID groupID)
-        {
-            // Add Session Status if it doesn't exist for this session
-            CreateGroupChatSessionTracking(groupID);
-
-            // If nessesary, remove from dropped list
-            if (m_groupsAgentsDroppedFromChatSession[groupID].Contains(agentID))
-            {
-                m_groupsAgentsDroppedFromChatSession[groupID].Remove(agentID);
-            }
-        }
-
-        private void CreateGroupChatSessionTracking(UUID groupID)
-        {
-            if (!m_groupsAgentsDroppedFromChatSession.ContainsKey(groupID))
-            {
-                m_groupsAgentsDroppedFromChatSession.Add(groupID, new List<UUID>());
-                m_groupsAgentsInvitedToChatSession.Add(groupID, new List<UUID>());
-            }
-
-        }
         #endregion
 
         #region XmlRpcHashtableMarshalling
@@ -931,36 +848,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         /// Encapsulate the XmlRpc call to standardize security and error handling.
         /// </summary>
         private Hashtable XmlRpcCall(UUID requestingAgentID, string function, Hashtable param)
-        {
-            XmlRpcResponse resp = null;
-            string CacheKey = null;
-
-            // Only bother with the cache if it isn't disabled.
-            if (m_cacheTimeout > 0)
-            {
-                if (!function.StartsWith("groups.get"))
-                {
-                    // Any and all updates cause the cache to clear
-                    m_memoryCache.Clear();
-                }
-                else
-                {
-                    StringBuilder sb = new StringBuilder(requestingAgentID + function);
-                    foreach (object key in param.Keys)
-                    {
-                        if (param[key] != null)
-                        {
-                            sb.AppendFormat(",{0}:{1}", key.ToString(), param[key].ToString());
-                        }
-                    }
-
-                    CacheKey = sb.ToString();
-                    m_memoryCache.TryGetValue(CacheKey, out resp);
-                }
-
-            }
-            
-            if( resp == null )
         {
             string UserService;
             UUID SessionID;
@@ -980,37 +867,33 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             ConfigurableKeepAliveXmlRpcRequest req;
             req = new ConfigurableKeepAliveXmlRpcRequest(function, parameters, m_disableKeepAlive);
 
+            XmlRpcResponse resp = null;
 
             try
             {
-                    resp = req.Send(m_groupsServerURI, 10000);
+                resp = req.Send(m_serviceURL, 10000);
-
-                    if ((m_cacheTimeout > 0) && (CacheKey != null))
-                    {
-                        m_memoryCache.AddOrUpdate(CacheKey, resp, TimeSpan.FromSeconds(m_cacheTimeout));
-                    }
-
             }
             catch (Exception e)
             {
-                    m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: An error has occured while attempting to access the XmlRpcGroups server method: {0}", function);
+                
-                    m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: {0} ", e.ToString());
+
+                m_log.ErrorFormat("[XMLRPCGROUPDATA]: An error has occured while attempting to access the XmlRpcGroups server method: {0}", function);
+                m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0} ", e.ToString());
 
                 foreach (string ResponseLine in req.RequestResponse.Split(new string[] { Environment.NewLine },StringSplitOptions.None))
                 {
-                        m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: {0} ", ResponseLine);
+                    m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0} ", ResponseLine);
                 }
 
                 foreach (string key in param.Keys)
                 {
-                        m_log.WarnFormat("[XMLRPC-GROUPS-CONNECTOR]: {0} :: {1}", key, param[key].ToString());
+                    m_log.WarnFormat("[XMLRPCGROUPDATA]: {0} :: {1}", key, param[key].ToString());
                 }
 
                 Hashtable respData = new Hashtable();
                 respData.Add("error", e.ToString());
                 return respData;
             }
-            }
 
             if (resp.Value is Hashtable)
             {
@@ -1023,21 +906,21 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 return respData;
             }
 
-            m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: The XmlRpc server returned a {1} instead of a hashtable for {0}", function, resp.Value.GetType().ToString());
+            m_log.ErrorFormat("[XMLRPCGROUPDATA]: The XmlRpc server returned a {1} instead of a hashtable for {0}", function, resp.Value.GetType().ToString());
 
             if (resp.Value is ArrayList)
             {
                 ArrayList al = (ArrayList)resp.Value;
-                m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: Contains {0} elements", al.Count);
+                m_log.ErrorFormat("[XMLRPCGROUPDATA]: Contains {0} elements", al.Count);
 
                 foreach (object o in al)
                 {
-                    m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: {0} :: {1}", o.GetType().ToString(), o.ToString());
+                    m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0} :: {1}", o.GetType().ToString(), o.ToString());
                 }
             }
             else
             {
-                m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: Function returned: {0}", resp.Value.ToString());
+                m_log.ErrorFormat("[XMLRPCGROUPDATA]: Function returned: {0}", resp.Value.ToString());
             }
 
             Hashtable error = new Hashtable();
@@ -1047,16 +930,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         private void LogRespDataToConsoleError(Hashtable respData)
         {
-            m_log.Error("[XMLRPC-GROUPS-CONNECTOR]: Error:");
+            m_log.Error("[XMLRPCGROUPDATA]: Error:");
 
             foreach (string key in respData.Keys)
             {
-                m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: Key: {0}", key);
+                m_log.ErrorFormat("[XMLRPCGROUPDATA]: Key: {0}", key);
 
                 string[] lines = respData[key].ToString().Split(new char[] { '\n' });
                 foreach (string line in lines)
                 {
-                    m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: {0}", line);
+                    m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0}", line);
                 }
 
             }
@@ -1065,8 +948,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         
         /// <summary>
         /// Group Request Tokens are an attempt to allow the groups service to authenticate 
-        /// requests.  
+        /// requests.  Currently uses UserService, AgentID, and SessionID
-        /// TODO: This broke after the big grid refactor, either find a better way, or discard this
+        /// TODO: Find a better way to do this.
         /// </summary>
         /// <param name="client"></param>
         /// <returns></returns>