Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs

OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs

@@ -209,7 +209,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 
             m_attMod.RezSingleAttachmentFromInventory(
                 m_presence, attItemId, (uint)AttachmentPoint.Chest);
-            m_attMod.DetachSingleAttachmentToInv(attItemId, m_presence.ControllingClient);
+            m_attMod.DetachSingleAttachmentToInv(m_presence, attItemId);
 
             // Check status on scene presence
             Assert.That(m_presence.HasAttachments(), Is.False);

OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs

@@ -29,7 +29,6 @@ using System;
 using System.Xml;
 using System.Collections.Generic;
 using OpenMetaverse;
-using OpenMetaverse.Packets;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 
@@ -41,6 +40,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// RezAttachments. This should only be called upon login on the first region.
         /// Attachment rezzings on crossings and TPs are done in a different way.
         /// </summary>
+        /// <param name="sp"></param>
         void RezAttachments(IScenePresence sp);
 
         /// <summary>
@@ -51,17 +51,16 @@ namespace OpenSim.Region.Framework.Interfaces
 
         /// <summary>
         /// Delete all the presence's attachments from the scene
-        /// </summary>
-        /// <param name="sp">
         /// This is done when a root agent leaves/is demoted to child (for instance, on logout, teleport or region cross).
-        /// </param>
+        /// </summary>
+        /// <param name="sp"></param>
         /// <param name="silent"></param>
         void DeleteAttachmentsFromScene(IScenePresence sp, bool silent);
 
         /// <summary>
         /// Attach an object to an avatar
         /// </summary>
-        /// <param name="remoteClient"></param>
+        /// <param name="sp"></param>
         /// <param name="grp"></param>
         /// <param name="AttachmentPt"></param>
         /// <param name="silent"></param>
@@ -79,27 +78,15 @@ namespace OpenSim.Region.Framework.Interfaces
 
         // Same as above, but also load script states from a separate doc
         ISceneEntity RezSingleAttachmentFromInventory(
-            IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus, XmlDocument doc);
+            IScenePresence presence, UUID itemID, uint AttachmentPt, bool updateInventoryStatus, XmlDocument doc);
 
         /// <summary>
         /// Rez multiple attachments from a user's inventory
         /// </summary>
         /// <param name="sp"></param>
-        /// <param name="header"></param>
+        /// <param name="rezlist"></param>
-        /// <param name="objects"></param>
         void RezMultipleAttachmentsFromInventory(IScenePresence sp,List<KeyValuePair<UUID, uint>> rezlist);
             
-        /// <summary>
-        /// Detach an object from the avatar.
-        /// </summary>
-        /// <remarks>
-        /// This method is called in response to a client's detach request, so we only update the information in
-        /// inventory
-        /// </remarks>
-        /// <param name="objectLocalID"></param>
-        /// <param name="remoteClient"></param>
-        void DetachObject(uint objectLocalID, IClientAPI remoteClient);
-            
         /// <summary>
         /// Detach the given item to the ground.
         /// </summary>
@@ -110,13 +97,9 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <summary>
         /// Detach the given item so that it remains in the user's inventory.
         /// </summary>
-        /// <param name="itemID">
+        /// <param name="sp">/param>
-        /// A <see cref="UUID"/>
+        /// <param name="itemID"></param>
-        /// </param>
+        void DetachSingleAttachmentToInv(IScenePresence sp, UUID itemID);
-        /// <param name="remoteClient">
-        /// A <see cref="IClientAPI"/>
-        /// </param>
-        void DetachSingleAttachmentToInv(UUID itemID, IClientAPI remoteClient);
         
         /// Update the position of an attachment.
         /// </summary>

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

@@ -3316,7 +3316,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
             if (attachmentsModule != null)
-                attachmentsModule.DetachSingleAttachmentToInv(itemID, presence.ControllingClient);
+                attachmentsModule.DetachSingleAttachmentToInv(presence, itemID);
         }
 
         public void llTakeCamera(string avatar)