aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/EventQueue
diff options
context:
space:
mode:
authorUbitUmarov2016-07-01 19:20:04 +0100
committerUbitUmarov2016-07-01 19:20:04 +0100
commit3af437c8bcd8590295f7cf6927cde0bcff9fa3b7 (patch)
tree502b143934fbfe6cc1dc67a20a61d5ec73f90022 /OpenSim/Region/ClientStack/Linden/Caps/EventQueue
parentsave one call to grid to get agent groups powers (xmlrpcgoups only for now (diff)
downloadopensim-SC-3af437c8bcd8590295f7cf6927cde0bcff9fa3b7.zip
opensim-SC-3af437c8bcd8590295f7cf6927cde0bcff9fa3b7.tar.gz
opensim-SC-3af437c8bcd8590295f7cf6927cde0bcff9fa3b7.tar.bz2
opensim-SC-3af437c8bcd8590295f7cf6927cde0bcff9fa3b7.tar.xz
cleanup a bit
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/EventQueue')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs6
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs34
2 files changed, 0 insertions, 40 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 9a1cef4..cc614f3 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -579,12 +579,6 @@ namespace OpenSim.Region.ClientStack.Linden
579 Enqueue(item, avatarID); 579 Enqueue(item, avatarID);
580 } 580 }
581 581
582 public void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID)
583 {
584 OSD item = EventQueueHelper.GroupMembership(groupUpdate);
585 Enqueue(item, avatarID);
586 }
587
588 public void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data) 582 public void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data)
589 { 583 {
590 OSD item = EventQueueHelper.GroupMembershipData(receiverAgent, data); 584 OSD item = EventQueueHelper.GroupMembershipData(receiverAgent, data);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
index 29d8b85..8beeb95 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
@@ -333,40 +333,6 @@ namespace OpenSim.Region.ClientStack.Linden
333 return chatterBoxSessionAgentListUpdates; 333 return chatterBoxSessionAgentListUpdates;
334 } 334 }
335 335
336 public static OSD GroupMembership(AgentGroupDataUpdatePacket groupUpdatePacket)
337 {
338 OSDMap groupUpdate = new OSDMap();
339 groupUpdate.Add("message", OSD.FromString("AgentGroupDataUpdate"));
340
341 OSDMap body = new OSDMap();
342 OSDArray agentData = new OSDArray();
343 OSDMap agentDataMap = new OSDMap();
344 agentDataMap.Add("AgentID", OSD.FromUUID(groupUpdatePacket.AgentData.AgentID));
345 agentData.Add(agentDataMap);
346 body.Add("AgentData", agentData);
347
348 OSDArray groupData = new OSDArray();
349
350 foreach (AgentGroupDataUpdatePacket.GroupDataBlock groupDataBlock in groupUpdatePacket.GroupData)
351 {
352 OSDMap groupDataMap = new OSDMap();
353 groupDataMap.Add("ListInProfile", OSD.FromBoolean(false));
354 groupDataMap.Add("GroupID", OSD.FromUUID(groupDataBlock.GroupID));
355 groupDataMap.Add("GroupInsigniaID", OSD.FromUUID(groupDataBlock.GroupInsigniaID));
356 groupDataMap.Add("Contribution", OSD.FromInteger(groupDataBlock.Contribution));
357 groupDataMap.Add("GroupPowers", OSD.FromBinary(ulongToByteArray(groupDataBlock.GroupPowers)));
358 groupDataMap.Add("GroupName", OSD.FromString(Utils.BytesToString(groupDataBlock.GroupName)));
359 groupDataMap.Add("AcceptNotices", OSD.FromBoolean(groupDataBlock.AcceptNotices));
360
361 groupData.Add(groupDataMap);
362
363 }
364 body.Add("GroupData", groupData);
365 groupUpdate.Add("body", body);
366
367 return groupUpdate;
368 }
369
370 public static OSD GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data) 336 public static OSD GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data)
371 { 337 {
372 OSDArray AgentData = new OSDArray(1); 338 OSDArray AgentData = new OSDArray(1);