Mantis #7920: group info was not being updated in many situations. (regression) Putting back the heavy messaging.

2 files changed, 12 insertions, 12 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 9a1cef4..d628cfc 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -585,9 +585,9 @@ namespace OpenSim.Region.ClientStack.Linden
             Enqueue(item, avatarID);
         }
 
-        public void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data)
+        public void GroupMembershipData(UUID receiverAgent, UUID dataForClientID, GroupMembershipData[] data)
         {
-            OSD item = EventQueueHelper.GroupMembershipData(receiverAgent, data);
+            OSD item = EventQueueHelper.GroupMembershipData(receiverAgent, dataForClientID, data);
             Enqueue(item, receiverAgent);
         }
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
index 2344fc6..7c8f441 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
@@ -367,7 +367,7 @@ namespace OpenSim.Region.ClientStack.Linden
             return groupUpdate;
         }
 
-        public static OSD GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data)
+        public static OSD GroupMembershipData(UUID receiverAgent, UUID dataForAgentID, GroupMembershipData[] data)
         {
             OSDArray AgentData = new OSDArray(1);
             OSDMap AgentDataMap = new OSDMap(1);
@@ -379,15 +379,15 @@ namespace OpenSim.Region.ClientStack.Linden
 
             foreach (GroupMembershipData membership in data)
             {
-                //if (receiverAgent != dataForAgentID)
-                //{
-                //    if (!membership.ListInProfile)
-                //    {
-                //        // If we're sending group info to remoteclient about another agent, 
-                //        // filter out groups the other agent doesn't want to share.
-                //        continue;
-                //    }
-                //}
+                if (receiverAgent != dataForAgentID)
+                {
+                    if (!membership.ListInProfile)
+                    {
+                        // If we're sending group info to remoteclient about another agent, 
+                        // filter out groups the other agent doesn't want to share.
+                        continue;
+                    }
+                }
 
                 OSDMap GroupDataMap = new OSDMap(6);
                 OSDMap NewGroupDataMap = new OSDMap(1);