ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
This commit is contained in:
Melanie
2011-10-11 23:17:47 +01:00
parent 1556389913 e77c919290
commit ef9a811ea6
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@@ -368,8 +368,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
public void RezMultipleAttachmentsFromInventory(
IClientAPI remoteClient,
RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header,
RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects)
List<KeyValuePair<UUID, uint>> rezlist)
{
if (!Enabled)
return;
@@ -388,9 +387,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
{
// m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing multiple attachments from inventory for {0}", sp.Name);
foreach (RezMultipleAttachmentsFromInvPacket.ObjectDataBlock obj in objects)
foreach (KeyValuePair<UUID, uint> rez in rezlist)
{
RezSingleAttachmentFromInventory(sp, obj.ItemID, obj.AttachmentPt);
RezSingleAttachmentFromInventory(sp, rez.Key, rez.Value);
}
}
}