Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs

1 files changed, 2 insertions, 2 deletions

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 @@
 
 using System;
 using System.Xml;
+using System.Collections.Generic;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
@@ -109,8 +110,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="objects"></param>
         void RezMultipleAttachmentsFromInventory(
             IClientAPI remoteClient,
-            RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header,
-            RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects);
+            List<KeyValuePair<UUID, uint>> rezlist);
 
         /// <summary>
         /// Detach an object from the avatar.