diff options
author | Dan Lake | 2011-10-03 11:55:54 -0700 |
---|---|---|
committer | Dan Lake | 2011-10-03 11:55:54 -0700 |
commit | e77c919290e166f19e77f3ef040418dd39f2f5bd (patch) | |
tree | 05a052d4a97e193cb804313408a03aabe3b4c85a /OpenSim/Region/CoreModules/Avatar/Attachments | |
parent | Add execute permission to runprebuild2010.bat (diff) | |
download | opensim-SC-e77c919290e166f19e77f3ef040418dd39f2f5bd.zip opensim-SC-e77c919290e166f19e77f3ef040418dd39f2f5bd.tar.gz opensim-SC-e77c919290e166f19e77f3ef040418dd39f2f5bd.tar.bz2 opensim-SC-e77c919290e166f19e77f3ef040418dd39f2f5bd.tar.xz |
Remove usage of Linden packet types from inside Attachments Module and interface
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 8757251..48695a4 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -360,8 +360,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
360 | 360 | ||
361 | public void RezMultipleAttachmentsFromInventory( | 361 | public void RezMultipleAttachmentsFromInventory( |
362 | IClientAPI remoteClient, | 362 | IClientAPI remoteClient, |
363 | RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header, | 363 | List<KeyValuePair<UUID, uint>> rezlist) |
364 | RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects) | ||
365 | { | 364 | { |
366 | if (!Enabled) | 365 | if (!Enabled) |
367 | return; | 366 | return; |
@@ -380,9 +379,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
380 | { | 379 | { |
381 | // m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing multiple attachments from inventory for {0}", sp.Name); | 380 | // m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing multiple attachments from inventory for {0}", sp.Name); |
382 | 381 | ||
383 | foreach (RezMultipleAttachmentsFromInvPacket.ObjectDataBlock obj in objects) | 382 | foreach (KeyValuePair<UUID, uint> rez in rezlist) |
384 | { | 383 | { |
385 | RezSingleAttachmentFromInventory(sp, obj.ItemID, obj.AttachmentPt); | 384 | RezSingleAttachmentFromInventory(sp, rez.Key, rez.Value); |
386 | } | 385 | } |
387 | } | 386 | } |
388 | } | 387 | } |
@@ -941,4 +940,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
941 | return item; | 940 | return item; |
942 | } | 941 | } |
943 | } | 942 | } |
944 | } \ No newline at end of file | 943 | } |