diff options
| author | Justin Clark-Casey (justincc) | 2011-10-03 23:26:52 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-10-03 23:26:52 +0100 |
| commit | 34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c (patch) | |
| tree | 6e67c262564a16a79e7821cc5d1c5a70090f5677 /OpenSim/Region/CoreModules/Avatar/Attachments | |
| parent | Remove vestigal RegionStatus.SlaveScene. (diff) | |
| parent | Remove usage of Linden packet types from inside Attachments Module and interface (diff) | |
| download | opensim-SC_OLD-34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c.zip opensim-SC_OLD-34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c.tar.gz opensim-SC_OLD-34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c.tar.bz2 opensim-SC_OLD-34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 | } |