diff options
Diffstat (limited to 'OpenSim/Region')
3 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 243dad5..575e5a2 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -6145,9 +6145,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6145 | RezMultipleAttachmentsFromInv handlerRezMultipleAttachments = OnRezMultipleAttachmentsFromInv; | 6145 | RezMultipleAttachmentsFromInv handlerRezMultipleAttachments = OnRezMultipleAttachmentsFromInv; |
6146 | if (handlerRezMultipleAttachments != null) | 6146 | if (handlerRezMultipleAttachments != null) |
6147 | { | 6147 | { |
6148 | RezMultipleAttachmentsFromInvPacket rez = (RezMultipleAttachmentsFromInvPacket)Pack; | 6148 | List<KeyValuePair<UUID, uint>> rezlist = new List<KeyValuePair<UUID, uint>>(); |
6149 | handlerRezMultipleAttachments(this, rez.HeaderData, | 6149 | foreach (RezMultipleAttachmentsFromInvPacket.ObjectDataBlock obj in ((RezMultipleAttachmentsFromInvPacket)Pack).ObjectData) |
6150 | rez.ObjectData); | 6150 | rezlist.Add(new KeyValuePair<UUID, uint>(obj.ItemID, obj.AttachmentPt)); |
6151 | handlerRezMultipleAttachments(this, rezlist); | ||
6151 | } | 6152 | } |
6152 | 6153 | ||
6153 | return true; | 6154 | return true; |
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 3bdb173..b58a1af 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -368,8 +368,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
368 | 368 | ||
369 | public void RezMultipleAttachmentsFromInventory( | 369 | public void RezMultipleAttachmentsFromInventory( |
370 | IClientAPI remoteClient, | 370 | IClientAPI remoteClient, |
371 | RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header, | 371 | List<KeyValuePair<UUID, uint>> rezlist) |
372 | RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects) | ||
373 | { | 372 | { |
374 | if (!Enabled) | 373 | if (!Enabled) |
375 | return; | 374 | return; |
@@ -388,9 +387,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
388 | { | 387 | { |
389 | // m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing multiple attachments from inventory for {0}", sp.Name); | 388 | // m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing multiple attachments from inventory for {0}", sp.Name); |
390 | 389 | ||
391 | foreach (RezMultipleAttachmentsFromInvPacket.ObjectDataBlock obj in objects) | 390 | foreach (KeyValuePair<UUID, uint> rez in rezlist) |
392 | { | 391 | { |
393 | RezSingleAttachmentFromInventory(sp, obj.ItemID, obj.AttachmentPt); | 392 | RezSingleAttachmentFromInventory(sp, rez.Key, rez.Value); |
394 | } | 393 | } |
395 | } | 394 | } |
396 | } | 395 | } |
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index d1b7dc1..d7f0a96 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Xml; | 29 | using System.Xml; |
30 | using System.Collections.Generic; | ||
30 | using OpenMetaverse; | 31 | using OpenMetaverse; |
31 | using OpenMetaverse.Packets; | 32 | using OpenMetaverse.Packets; |
32 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
@@ -109,8 +110,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
109 | /// <param name="objects"></param> | 110 | /// <param name="objects"></param> |
110 | void RezMultipleAttachmentsFromInventory( | 111 | void RezMultipleAttachmentsFromInventory( |
111 | IClientAPI remoteClient, | 112 | IClientAPI remoteClient, |
112 | RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header, | 113 | List<KeyValuePair<UUID, uint>> rezlist); |
113 | RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects); | ||
114 | 114 | ||
115 | /// <summary> | 115 | /// <summary> |
116 | /// Detach an object from the avatar. | 116 | /// Detach an object from the avatar. |