diff options
author | Melanie | 2012-03-28 02:20:40 +0100 |
---|---|---|
committer | Melanie | 2012-03-28 02:20:40 +0100 |
commit | b519cf63830f6248440525516eb7f70eba86abf3 (patch) | |
tree | 085ad7245d7dbdb59113d8e5b0822529703d0916 /OpenSim/Region/ClientStack/Linden | |
parent | Add SendRemoveInventoryFolders which allows to remove one or more (diff) | |
parent | Add a corresponding method for items. HG v2 (diff) | |
download | opensim-SC-b519cf63830f6248440525516eb7f70eba86abf3.zip opensim-SC-b519cf63830f6248440525516eb7f70eba86abf3.tar.gz opensim-SC-b519cf63830f6248440525516eb7f70eba86abf3.tar.bz2 opensim-SC-b519cf63830f6248440525516eb7f70eba86abf3.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Client/IClientInventory.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 557ab30..dd18b16 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -12423,6 +12423,44 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
12423 | OutPacket(reply, ThrottleOutPacketType.Task); | 12423 | OutPacket(reply, ThrottleOutPacketType.Task); |
12424 | } | 12424 | } |
12425 | 12425 | ||
12426 | public void SendRemoveInventoryItems(UUID[] items) | ||
12427 | { | ||
12428 | IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); | ||
12429 | |||
12430 | if (eq == null) | ||
12431 | { | ||
12432 | m_log.DebugFormat("[LLCLIENT]: Null event queue"); | ||
12433 | return; | ||
12434 | } | ||
12435 | |||
12436 | OSDMap llsd = new OSDMap(3); | ||
12437 | |||
12438 | OSDMap AgentDataMap = new OSDMap(1); | ||
12439 | AgentDataMap.Add("AgentID", OSD.FromUUID(AgentId)); | ||
12440 | AgentDataMap.Add("SessionID", OSD.FromUUID(SessionId)); | ||
12441 | |||
12442 | OSDArray AgentData = new OSDArray(1); | ||
12443 | AgentData.Add(AgentDataMap); | ||
12444 | |||
12445 | llsd.Add("AgentData", AgentData); | ||
12446 | |||
12447 | OSDArray ItemData = new OSDArray(); | ||
12448 | |||
12449 | foreach (UUID item in items) | ||
12450 | { | ||
12451 | OSDMap ItemDataMap = new OSDMap(2); | ||
12452 | ItemDataMap.Add("ItemID", OSD.FromUUID(item)); | ||
12453 | ItemDataMap.Add("AgentID", OSD.FromUUID(AgentId)); | ||
12454 | |||
12455 | ItemData.Add(ItemDataMap); | ||
12456 | } | ||
12457 | |||
12458 | llsd.Add("ItemData", ItemData); | ||
12459 | |||
12460 | eq.Enqueue(BuildEvent("RemoveInventoryItem", | ||
12461 | llsd), AgentId); | ||
12462 | } | ||
12463 | |||
12426 | public void SendRemoveInventoryFolders(UUID[] folders) | 12464 | public void SendRemoveInventoryFolders(UUID[] folders) |
12427 | { | 12465 | { |
12428 | IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); | 12466 | IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); |