aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
diff options
context:
space:
mode:
authorMelanie Thielker2016-07-04 03:37:45 +0100
committerMelanie Thielker2016-07-04 03:37:45 +0100
commit4468aa0dcfebb045bc54df1f67f021f85f9bc4b6 (patch)
treef52b7cf28acfe4bdbdff7ed7dfd112c6dd6b16fb /OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
parentFinally remove the requirement for an InventoryItem/FolderBase object to (diff)
parentNew config var: DisableObjectTransfer. If set to True, objects never cross; i... (diff)
downloadopensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.zip
opensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.gz
opensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.bz2
opensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.xz
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs34
1 files changed, 0 insertions, 34 deletions
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);