Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2 files changed, 7 insertions, 32 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index d7f0a96..e2a3fa7 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -59,17 +59,6 @@ namespace OpenSim.Region.Framework.Interfaces
         void DeleteAttachmentsFromScene(IScenePresence sp, bool silent);
 
         /// <summary>
-        /// Attach an object to an avatar from the world.
-        /// </summary>
-        /// <param name="controllingClient"></param>
-        /// <param name="localID"></param>
-        /// <param name="attachPoint"></param>
-        /// <param name="rot"></param>
-        /// <param name="silent"></param>
-        void AttachObject(
-            IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent);
-
-        /// <summary>
         /// Attach an object to an avatar
         /// </summary>
         /// <param name="remoteClient"></param>
@@ -77,17 +66,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="AttachmentPt"></param>
         /// <param name="silent"></param>
         /// <returns>true if the object was successfully attached, false otherwise</returns>
-        bool AttachObject(
-            IClientAPI remoteClient, SceneObjectGroup grp, uint AttachmentPt, bool silent);
-
-        /// <summary>
-        /// Rez an attachment from user inventory and change inventory status to match.
-        /// </summary>
-        /// <param name="remoteClient"></param>
-        /// <param name="itemID"></param>
-        /// <param name="AttachmentPt"></param>
-        /// <returns>The scene object that was attached.  Null if the scene object could not be found</returns>
-        ISceneEntity RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
+        bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent);
 
         /// <summary>
         /// Rez an attachment from user inventory and change inventory status to match.
@@ -96,7 +75,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="itemID"></param>
         /// <param name="AttachmentPt"></param>
         /// <returns>The scene object that was attached.  Null if the scene object could not be found</returns>
-        ISceneEntity RezSingleAttachmentFromInventory(ScenePresence sp, UUID itemID, uint AttachmentPt);
+        ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt);
 
         // Same as above, but also load script states from a separate doc
         ISceneEntity RezSingleAttachmentFromInventory(
@@ -105,12 +84,10 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <summary>
         /// Rez multiple attachments from a user's inventory
         /// </summary>
-        /// <param name="remoteClient"></param>
+        /// <param name="sp"></param>
         /// <param name="header"></param>
         /// <param name="objects"></param>
-        void RezMultipleAttachmentsFromInventory(
-            IClientAPI remoteClient,
-            List<KeyValuePair<UUID, uint>> rezlist);
+        void RezMultipleAttachmentsFromInventory(IScenePresence sp,List<KeyValuePair<UUID, uint>> rezlist);
 
         /// <summary>
         /// Detach an object from the avatar.
@@ -126,9 +103,9 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <summary>
         /// Detach the given item to the ground.
         /// </summary>
+        /// <param name="sp"></param>

         /// <param name="objectLocalID"></param>
-        /// <param name="remoteClient"></param>
-        void DetachSingleAttachmentToGround(uint objectLocalID, IClientAPI remoteClient);
+        void DetachSingleAttachmentToGround(IScenePresence sp, uint objectLocalID);
 
         /// <summary>
         /// Detach the given item so that it remains in the user's inventory.
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9c4757c..b288c8a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2528,9 +2528,7 @@ namespace OpenSim.Region.Framework.Scenes
                     RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
                     
                     if (AttachmentsModule != null)
-                        AttachmentsModule.AttachObject(sp.ControllingClient, grp, 0, false);
-
-                    m_log.DebugFormat("[SCENE]: Attachment {0} arrived and scene presence was found, attaching", sceneObject.UUID);
+                        AttachmentsModule.AttachObject(sp, grp, 0, false);
                 }
                 else
                 {