From d00770d56bf00640f23f462d8ab51f851530234c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 8 Jun 2013 11:00:22 -0700
Subject: Groups V2 -- fix mantis #6666

---
 OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Addons/Groups')

diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
index 7e0b112..cff7adf 100644
--- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
@@ -684,6 +684,9 @@ namespace OpenSim.Groups
         {
             serviceLocation = string.Empty;
             name = string.Empty;
+            if (groupID.Equals(UUID.Zero))
+                return true;
+
             ExtendedGroupRecord group = m_LocalGroupsConnector.GetGroupRecord(UUID.Zero.ToString(), groupID, string.Empty);
             if (group == null)
             {
-- 
cgit v1.1


From e741e5ebce7759a7ee75c638d73e17c8a5f38394 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 9 Jun 2013 20:20:37 -0700
Subject: More on mantis #6666 -- Groups V2 remote connector.

---
 OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Addons/Groups')

diff --git a/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs b/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs
index e7d38c2..79d6fc5 100644
--- a/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs
+++ b/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs
@@ -209,13 +209,10 @@ namespace OpenSim.Groups
         public void SetAgentActiveGroup(string AgentID, GroupMembershipDelegate d)
         {
             GroupMembershipData activeGroup = d();
-            if (activeGroup != null)
-            {
-                string cacheKey = "active-" + AgentID.ToString();
-                lock (m_Cache)
-                    if (m_Cache.Contains(cacheKey))
-                        m_Cache.AddOrUpdate(cacheKey, activeGroup, GROUPS_CACHE_TIMEOUT);
-            }
+            string cacheKey = "active-" + AgentID.ToString();
+            lock (m_Cache)
+                if (m_Cache.Contains(cacheKey))
+                    m_Cache.AddOrUpdate(cacheKey, activeGroup, GROUPS_CACHE_TIMEOUT);
         }
 
         public ExtendedGroupMembershipData GetAgentActiveMembership(string AgentID, GroupMembershipDelegate d)
-- 
cgit v1.1