diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs | 12 |
2 files changed, 3 insertions, 13 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index d628cfc..9a1cef4 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 | |||
585 | Enqueue(item, avatarID); | 585 | Enqueue(item, avatarID); |
586 | } | 586 | } |
587 | 587 | ||
588 | public void GroupMembershipData(UUID receiverAgent, UUID dataForClientID, GroupMembershipData[] data) | 588 | public void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data) |
589 | { | 589 | { |
590 | OSD item = EventQueueHelper.GroupMembershipData(receiverAgent, dataForClientID, data); | 590 | OSD item = EventQueueHelper.GroupMembershipData(receiverAgent, data); |
591 | Enqueue(item, receiverAgent); | 591 | Enqueue(item, receiverAgent); |
592 | } | 592 | } |
593 | 593 | ||
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs index 7c8f441..29d8b85 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 | |||
367 | return groupUpdate; | 367 | return groupUpdate; |
368 | } | 368 | } |
369 | 369 | ||
370 | public static OSD GroupMembershipData(UUID receiverAgent, UUID dataForAgentID, GroupMembershipData[] data) | 370 | public static OSD GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data) |
371 | { | 371 | { |
372 | OSDArray AgentData = new OSDArray(1); | 372 | OSDArray AgentData = new OSDArray(1); |
373 | OSDMap AgentDataMap = new OSDMap(1); | 373 | OSDMap AgentDataMap = new OSDMap(1); |
@@ -379,16 +379,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
379 | 379 | ||
380 | foreach (GroupMembershipData membership in data) | 380 | foreach (GroupMembershipData membership in data) |
381 | { | 381 | { |
382 | if (receiverAgent != dataForAgentID) | ||
383 | { | ||
384 | if (!membership.ListInProfile) | ||
385 | { | ||
386 | // If we're sending group info to remoteclient about another agent, | ||
387 | // filter out groups the other agent doesn't want to share. | ||
388 | continue; | ||
389 | } | ||
390 | } | ||
391 | |||
392 | OSDMap GroupDataMap = new OSDMap(6); | 382 | OSDMap GroupDataMap = new OSDMap(6); |
393 | OSDMap NewGroupDataMap = new OSDMap(1); | 383 | OSDMap NewGroupDataMap = new OSDMap(1); |
394 | 384 | ||