Patch from mcortez. This appears to be a huge change to the groups module

and I can't say if this is beneficial or destructive due to the way it
was delivered (zipfile). Pushing this on faith alone.

1 files changed, 84 insertions, 14 deletions

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index ab343c8..8e7aa68 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -61,15 +61,22 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         private bool m_connectorEnabled = false;
 
-        private string m_serviceURL = string.Empty;
+        private string m_groupsServerURI = string.Empty;
 
         private bool m_disableKeepAlive = false;
 
         private string m_groupReadKey  = string.Empty;
         private string m_groupWriteKey = string.Empty;
 
-        private IUserAccountService m_accountService = null;
-        
+        private IUserAccountService m_accountService = null;

+

+        // 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
 
@@ -104,13 +111,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     return;
                 }
 
-                m_log.InfoFormat("[GROUPS-CONNECTOR]: Initializing {0}", this.Name);
-
-                m_serviceURL = groupsConfig.GetString("XmlRpcServiceURL", string.Empty);
-                if ((m_serviceURL == null) ||
-                    (m_serviceURL == string.Empty))
-                {
-                    m_log.ErrorFormat("Please specify a valid URL for XmlRpcServiceURL in OpenSim.ini, [Groups]");
+                m_log.InfoFormat("[GROUPS-CONNECTOR]: Initializing {0}", this.Name);

+

+                m_groupsServerURI = groupsConfig.GetString("GroupsServerURI", string.Empty);
+                if ((m_groupsServerURI == null) ||
+                    (m_groupsServerURI == string.Empty))
+                {

+                    m_log.ErrorFormat("Please specify a valid URL for GroupsServerURI in OpenSim.ini, [Groups]");
                     m_connectorEnabled = false;
                     return;
                 }
@@ -756,7 +763,70 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             XmlRpcCall(requestingAgentID, "groups.addGroupNotice", param);
         }
-        #endregion
+
+
+
+        #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
         private GroupProfileData GroupProfileHashtableToGroupProfileData(Hashtable groupProfile)
@@ -871,7 +941,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             try
             {
-                resp = req.Send(m_serviceURL, 10000);
+                resp = req.Send(m_groupsServerURI, 10000);
             }
             catch (Exception e)
             {
@@ -948,8 +1018,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         
         /// <summary>
         /// Group Request Tokens are an attempt to allow the groups service to authenticate 
-        /// requests.  Currently uses UserService, AgentID, and SessionID
-        /// TODO: Find a better way to do this.
+        /// requests.  
+        /// TODO: This broke after the big grid refactor, either find a better way, or discard this
         /// </summary>
         /// <param name="client"></param>
         /// <returns></returns>