Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge

2 files changed, 457 insertions, 431 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index a130ed2..09781c7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -45,29 +45,47 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AttachmentsModule")]
     public class AttachmentsModule : IAttachmentsModule, INonSharedRegionModule
     {
+        #region INonSharedRegionModule
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         private Scene m_scene;
         private IDialogModule m_dialogModule;
+
+        /// <summary>
+        /// Are attachments enabled?
+        /// </summary>
+        public bool Enabled { get; private set; }
         
         public string Name { get { return "Attachments Module"; } }
         public Type ReplaceableInterface { get { return null; } }
 
-        public void Initialise(IConfigSource source) {}
+        public void Initialise(IConfigSource source)
+        {
+            IConfig config = source.Configs["Attachments"];
+            if (config != null)
+                Enabled = config.GetBoolean("Enabled", true);
+            else
+                Enabled = true;
+        }
         
         public void AddRegion(Scene scene)
         {
             m_scene = scene;
             m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>();
             m_scene.RegisterModuleInterface<IAttachmentsModule>(this);
-            m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
+
+            if (Enabled)
+                m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
+
             // TODO: Should probably be subscribing to CloseClient too, but this doesn't yet give us IClientAPI
         }
         
         public void RemoveRegion(Scene scene) 
         {
             m_scene.UnregisterModuleInterface<IAttachmentsModule>(this);
-            m_scene.EventManager.OnNewClient -= SubscribeToClientEvents;
+
+            if (Enabled)
+                m_scene.EventManager.OnNewClient -= SubscribeToClientEvents;
         }
         
         public void RegionLoaded(Scene scene) {}
@@ -76,26 +94,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         {
             RemoveRegion(m_scene);
         }
-        
-        public void SubscribeToClientEvents(IClientAPI client)
-        {
-            client.OnRezSingleAttachmentFromInv += RezSingleAttachmentFromInventory;
-            client.OnRezMultipleAttachmentsFromInv += RezMultipleAttachmentsFromInventory;
-            client.OnObjectAttach += AttachObject;
-            client.OnObjectDetach += DetachObject;
-            client.OnDetachAttachmentIntoInv += DetachSingleAttachmentToInv;
-            client.OnObjectDrop += DetachSingleAttachmentToGround;
-        }
-        
-        public void UnsubscribeFromClientEvents(IClientAPI client)
-        {
-            client.OnRezSingleAttachmentFromInv -= RezSingleAttachmentFromInventory;
-            client.OnRezMultipleAttachmentsFromInv -= RezMultipleAttachmentsFromInventory;
-            client.OnObjectAttach -= AttachObject;
-            client.OnObjectDetach -= DetachObject;
-            client.OnDetachAttachmentIntoInv -= DetachSingleAttachmentToInv;
-            client.OnObjectDrop -= DetachSingleAttachmentToGround;
-        }
+
+        #endregion
+
+        #region IAttachmentsModule
 
         /// <summary>
         /// RezAttachments. This should only be called upon login on the first region.
@@ -103,6 +105,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// </summary>
         public void RezAttachments(IScenePresence sp)
         {
+            if (!Enabled)
+                return;
+
             if (null == sp.Appearance)
             {
                 m_log.WarnFormat("[ATTACHMENTS MODULE]: Appearance has not been initialized for agent {0}", sp.UUID);
@@ -133,7 +138,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     if (sp.PresenceType == PresenceType.Npc)
                         RezSingleAttachmentFromInventoryInternal(sp, UUID.Zero, attach.AssetID, p, null);
                     else
-                        RezSingleAttachmentFromInventory(sp.ControllingClient, attach.ItemID, p);
+                        RezSingleAttachmentFromInventory(sp, attach.ItemID, p);
                 }
                 catch (Exception e)
                 {
@@ -146,13 +151,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         {
 //            m_log.DebugFormat("[ATTACHMENTS MODULE]: Saving changed attachments for {0}", sp.Name);
 
+            if (!Enabled)
+                return;
+
             foreach (SceneObjectGroup grp in sp.GetAttachments())
             {
 //                if (grp.HasGroupChanged) // Resizer scripts?
 //                {
                     grp.IsAttachment = false;
                     grp.AbsolutePosition = grp.RootPart.AttachedPos;
-                    UpdateKnownItem(sp.ControllingClient, grp);
+                    UpdateKnownItem(sp, grp);
                     grp.IsAttachment = true;
 //                }
             }
@@ -164,6 +172,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 //                "[ATTACHMENTS MODULE]: Deleting attachments from scene {0} for {1}, silent = {2}",
 //                m_scene.RegionInfo.RegionName, sp.Name, silent);
 
+            if (!Enabled)
+                return;
+
             foreach (SceneObjectGroup sop in sp.GetAttachments())
             {
                 sop.Scene.DeleteSceneObject(sop, silent);
@@ -172,87 +183,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             sp.ClearAttachments();
         }
         
-        /// <summary>
-        /// Called by client
-        /// </summary>
-        /// <param name="remoteClient"></param>
-        /// <param name="objectLocalID"></param>
-        /// <param name="AttachmentPt"></param>
-        /// <param name="silent"></param>
-        public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent)
-        {
-//            m_log.DebugFormat(
-//                "[ATTACHMENTS MODULE]: Attaching object local id {0} to {1} point {2} from ground (silent = {3})",
-//                objectLocalID, remoteClient.Name, AttachmentPt, silent);
-
-            try
-            {
-                ScenePresence sp = m_scene.GetScenePresence(remoteClient.AgentId);
-
-                if (sp == null)
-                {
-                    m_log.ErrorFormat(
-                        "[ATTACHMENTS MODULE]: Could not find presence for client {0} {1}", remoteClient.Name, remoteClient.AgentId);
-                    return;
-                }
-
-                // If we can't take it, we can't attach it!
-                SceneObjectPart part = m_scene.GetSceneObjectPart(objectLocalID);
-                if (part == null)
-                    return;
-
-                if (!m_scene.Permissions.CanTakeObject(part.UUID, remoteClient.AgentId))
-                {
-                    remoteClient.SendAgentAlertMessage(
-                        "You don't have sufficient permissions to attach this object", false);
-                    
-                    return;
-                }
-
-                if (part.OwnerID != remoteClient.AgentId) // Not ours
-                {
-                    remoteClient.SendAgentAlertMessage(
-                        "You don't have sufficient permissions to attach this object", false);
-                    return;
-                }
-
-                // TODO: this short circuits multiple attachments functionality  in  LL viewer 2.1+ and should
-                // be removed when that functionality is implemented in opensim
-                AttachmentPt &= 0x7f;
-
-                // Calls attach with a Zero position
-                if (AttachObject(sp, part.ParentGroup, AttachmentPt, false))
-                {
-                    m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId);
-
-                    // Save avatar attachment information
-                    m_log.Debug(
-                        "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId
-                        + ", AttachmentPoint: " + AttachmentPt);
-
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat("[ATTACHMENTS MODULE]: exception upon Attach Object {0}{1}", e.Message, e.StackTrace);
-            }
-        }
-
-        public bool AttachObject(IClientAPI remoteClient, SceneObjectGroup group, uint AttachmentPt, bool silent)
-        {
-            ScenePresence sp = m_scene.GetScenePresence(remoteClient.AgentId);
-
-            if (sp == null)
-            {
-                m_log.ErrorFormat(
-                    "[ATTACHMENTS MODULE]: Could not find presence for client {0} {1}", remoteClient.Name, remoteClient.AgentId);
-                return false;
-            }
-
-            return AttachObject(sp, group, AttachmentPt, silent);
-        }
-        
-        private bool AttachObject(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent)
+        public bool AttachObject(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent)
         {
             lock (sp.AttachmentsSyncLock)
             {
@@ -313,7 +244,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                         UUID oldAttachmentItemID = attachments[0].GetFromItemID();
         
                         if (oldAttachmentItemID != UUID.Zero)
-                            DetachSingleAttachmentToInv(oldAttachmentItemID, sp);
+                            DetachSingleAttachmentToInvInternal(sp, oldAttachmentItemID);
                         else
                             m_log.WarnFormat(
                                 "[ATTACHMENTS MODULE]: When detaching existing attachment {0} {1} at point {2} to make way for {3} {4} for {5}, couldn't find the associated item ID to adjust inventory attachment record!",
@@ -323,7 +254,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     // Add the new attachment to inventory if we don't already have it.
                     UUID newAttachmentItemID = group.GetFromItemID();
                     if (newAttachmentItemID == UUID.Zero)
-                        newAttachmentItemID = AddSceneObjectAsNewAttachmentInInv(sp.ControllingClient, group).ID;
+                        newAttachmentItemID = AddSceneObjectAsNewAttachmentInInv(sp, group).ID;
         
                     ShowAttachInUserInventory(sp, attachmentPt, newAttachmentItemID, group);
                 }
@@ -334,55 +265,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             return true;
         }
 
-        public void RezMultipleAttachmentsFromInventory(
-            IClientAPI remoteClient, 
-            RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header,
-            RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects)
-        {
-            ScenePresence sp = m_scene.GetScenePresence(remoteClient.AgentId);
-
-            if (sp == null)
-            {
-                m_log.ErrorFormat(
-                    "[ATTACHMENTS MODULE]: Could not find presence for client {0} {1} in RezMultipleAttachmentsFromInventory()",
-                    remoteClient.Name, remoteClient.AgentId);
-                return;
-            }
-
-            lock (sp.AttachmentsSyncLock)
-            {
-//                m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing multiple attachments from inventory for {0}", sp.Name);
-
-                foreach (RezMultipleAttachmentsFromInvPacket.ObjectDataBlock obj in objects)
-                {
-                    RezSingleAttachmentFromInventory(sp, obj.ItemID, obj.AttachmentPt);
-                }
-            }
-        }
-        
-        public ISceneEntity RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
-        {
-            return RezSingleAttachmentFromInventory(remoteClient, itemID, AttachmentPt, true, null);
-        }
+        public ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt)
+                {
+                        return RezSingleAttachmentFromInventory(sp, itemID, AttachmentPt, true, null);
+                }
 
-        public ISceneEntity RezSingleAttachmentFromInventory(
-            IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus, XmlDocument doc)
+                public ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt, bool updateInventoryStatus, XmlDocument doc)
         {
-            ScenePresence sp = m_scene.GetScenePresence(remoteClient.AgentId);
-
-            if (sp == null)
-            {
-                m_log.ErrorFormat(
-                    "[ATTACHMENTS MODULE]: Could not find presence for client {0} {1} in RezSingleAttachmentFromInventory()",
-                    remoteClient.Name, remoteClient.AgentId);
+            if (!Enabled)
                 return null;
-            }
-
-            return RezSingleAttachmentFromInventory(sp, itemID, AttachmentPt);
-        }
 
-        public ISceneEntity RezSingleAttachmentFromInventory(ScenePresence sp, UUID itemID, uint AttachmentPt)
-        {
 //            m_log.DebugFormat(
 //                "[ATTACHMENTS MODULE]: RezSingleAttachmentFromInventory to point {0} from item {1} for {2}",
 //                (AttachmentPoint)AttachmentPt, itemID, sp.Name);
@@ -417,188 +309,44 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 return null;
             }
 
-            SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt, null);
+            SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt, doc);
 
             if (att == null)
-                DetachSingleAttachmentToInv(itemID, sp.ControllingClient);
+                DetachSingleAttachmentToInv(sp, itemID);
 
             return att;
         }
 
-        protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal(
-            IScenePresence sp, UUID itemID, UUID assetID, uint attachmentPt, XmlDocument doc)
-        {
-            IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>();
-            if (invAccess != null)
-            {
-                lock (sp.AttachmentsSyncLock)
-                {
-                    SceneObjectGroup objatt;
-    
-                    if (itemID != UUID.Zero)
-                        objatt = invAccess.RezObject(sp.ControllingClient,
-                            itemID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
-                            false, false, sp.UUID, true);
-                    else
-                        objatt = invAccess.RezObject(sp.ControllingClient,
-                            null, assetID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
-                            false, false, sp.UUID, true);
-    
-    //                m_log.DebugFormat(
-    //                    "[ATTACHMENTS MODULE]: Retrieved single object {0} for attachment to {1} on point {2}",
-    //                    objatt.Name, remoteClient.Name, AttachmentPt);
-                    
-                    if (objatt != null)
-                    {
-                        // HasGroupChanged is being set from within RezObject.  Ideally it would be set by the caller.
-                        objatt.HasGroupChanged = false;
-                        bool tainted = false;
-                        if (attachmentPt != 0 && attachmentPt != objatt.AttachmentPoint)
-                            tainted = true;
-    
-                        // This will throw if the attachment fails
-                        try
-                        {
-                            AttachObject(sp, objatt, attachmentPt, false);
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat(
-                                "[ATTACHMENTS MODULE]: Failed to attach {0} {1} for {2}, exception {3}{4}",
-                                objatt.Name, objatt.UUID, sp.Name, e.Message, e.StackTrace);
-    
-                            // Make sure the object doesn't stick around and bail
-                            sp.RemoveAttachment(objatt);
-                            m_scene.DeleteSceneObject(objatt, false);
-                            return null;
-                        }
-                        
-                        if (tainted)
-                            objatt.HasGroupChanged = true;
-    
-                        // Fire after attach, so we don't get messy perms dialogs
-                        // 4 == AttachedRez
-                        objatt.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 4);
-                        objatt.ResumeScripts();
-    
-                        // Do this last so that event listeners have access to all the effects of the attachment
-                        m_scene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, sp.UUID);
-
-                        return objatt;
-                    }
-                    else
-                    {
-                        m_log.WarnFormat(
-                            "[ATTACHMENTS MODULE]: Could not retrieve item {0} for attaching to avatar {1} at point {2}",
-                            itemID, sp.Name, attachmentPt);
-                    }
-
-                    if (doc != null)
-                    {
-                        objatt.LoadScriptState(doc);
-                        objatt.ResetOwnerChangeFlag();
-                    }
-
-                    // Fire after attach, so we don't get messy perms dialogs
-                    // 4 == AttachedRez
-                    objatt.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 4);
-                    objatt.ResumeScripts();
-
-                    // Do this last so that event listeners have access to all the effects of the attachment
-                    m_scene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, sp.UUID);
-                }
-            }
-            
-            return null;
-        }
-
-        /// <summary>
-        /// Update the user inventory to reflect an attachment
-        /// </summary>
-        /// <param name="sp"></param>
-        /// <param name="AttachmentPt"></param>
-        /// <param name="itemID"></param>
-        /// <param name="att"></param>
-        private void ShowAttachInUserInventory(
-            IScenePresence sp, uint AttachmentPt, UUID itemID, SceneObjectGroup att)
+        public void RezMultipleAttachmentsFromInventory(IScenePresence sp, List<KeyValuePair<UUID, uint>> rezlist)
         {
-//            m_log.DebugFormat(
-//                "[USER INVENTORY]: Updating attachment {0} for {1} at {2} using item ID {3}",
-//                att.Name, sp.Name, AttachmentPt, itemID);
-            
-            if (UUID.Zero == itemID)
-            {
-                m_log.Error("[ATTACHMENTS MODULE]: Unable to save attachment. Error inventory item ID.");
-                return;
-            }
-
-            if (0 == AttachmentPt)
-            {
-                m_log.Error("[ATTACHMENTS MODULE]: Unable to save attachment. Error attachment point.");
-                return;
-            }
-
-            if (null == att.RootPart)
-            {
-                m_log.Error("[ATTACHMENTS MODULE]: Unable to save attachment for a prim without the rootpart!");
+            if (!Enabled)
                 return;
-            }
-            InventoryItemBase item = new InventoryItemBase(itemID, sp.UUID);
-
-
-
-
-
-
-            item = m_scene.InventoryService.GetItem(item);
-            bool changed = sp.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID);
-            if (changed && m_scene.AvatarFactory != null)
-                m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID);
-        }
 
-        public void DetachObject(uint objectLocalID, IClientAPI remoteClient)
-        {
-//            m_log.DebugFormat(
-//                "[ATTACHMENTS MODULE]: DetachObject() for object {0} on {1}", objectLocalID, remoteClient.Name);
-
-            SceneObjectGroup group = m_scene.GetGroupByPrim(objectLocalID);
-            if (group != null)
-            {
-                DetachSingleAttachmentToInv(group.GetFromItemID(), remoteClient);
-            }
-        }
-        
-        public void DetachSingleAttachmentToInv(UUID itemID, IClientAPI remoteClient)
-        {
-            ScenePresence presence;
-            if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence))
+            //                m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing multiple attachments from inventory for {0}", sp.Name);
+            lock (sp.AttachmentsSyncLock)
             {
-                lock (presence.AttachmentsSyncLock)
+                foreach (KeyValuePair<UUID, uint> rez in rezlist)
                 {
-                    // Save avatar attachment information
-                    m_log.Debug("[ATTACHMENTS MODULE]: Detaching from UserID: " + remoteClient.AgentId + ", ItemID: " + itemID);
-
-                    bool changed = presence.Appearance.DetachAttachment(itemID);
-                    if (changed && m_scene.AvatarFactory != null)
-                        m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
-    
-                    DetachSingleAttachmentToInv(itemID, presence);
+                    RezSingleAttachmentFromInventory(sp, rez.Key, rez.Value);
                 }
             }
         }
 
-        public void DetachSingleAttachmentToGround(uint soLocalId, IClientAPI remoteClient)
+        public void DetachSingleAttachmentToGround(IScenePresence sp, uint soLocalId)
         {
+            if (!Enabled)
+                return;
+
 //            m_log.DebugFormat(
 //                "[ATTACHMENTS MODULE]: DetachSingleAttachmentToGround() for {0}, object {1}",
-//                remoteClient.Name, soLocalId);
+//                sp.UUID, soLocalId);
 
             SceneObjectGroup so = m_scene.GetGroupByPrim(soLocalId);
 
             if (so == null)
                 return;
 
-            if (so.AttachedAvatar != remoteClient.AgentId)
+            if (so.AttachedAvatar != sp.UUID)
                 return;
 
             UUID inventoryID = so.GetFromItemID();
@@ -607,103 +355,62 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 //                "[ATTACHMENTS MODULE]: In DetachSingleAttachmentToGround(), object is {0} {1}, associated item is {2}",
 //                so.Name, so.LocalId, inventoryID);
 
-            ScenePresence presence;
-            if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence))
+            lock (sp.AttachmentsSyncLock)
             {
-                lock (presence.AttachmentsSyncLock)
-                {
-                    if (!m_scene.Permissions.CanRezObject(
-                        so.PrimCount, remoteClient.AgentId, presence.AbsolutePosition))
-                        return;
-
-                    bool changed = presence.Appearance.DetachAttachment(inventoryID);
-                    if (changed && m_scene.AvatarFactory != null)
-                        m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
-
-                    presence.RemoveAttachment(so);
-                    DetachSceneObjectToGround(so, presence);
-
-                    List<UUID> uuids = new List<UUID>();
-                    uuids.Add(inventoryID);
-                    m_scene.InventoryService.DeleteItems(remoteClient.AgentId, uuids);
-                    remoteClient.SendRemoveInventoryItem(inventoryID);
-                }
+                if (!m_scene.Permissions.CanRezObject(
+                    so.PrimCount, sp.UUID, sp.AbsolutePosition))
+                    return;
 
-                m_scene.EventManager.TriggerOnAttach(so.LocalId, so.UUID, UUID.Zero);
+                bool changed = sp.Appearance.DetachAttachment(inventoryID);
+                if (changed && m_scene.AvatarFactory != null)
+                    m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID);
+
+                sp.RemoveAttachment(so);
+
+                SceneObjectPart rootPart = so.RootPart;
+                rootPart.FromItemID = UUID.Zero;
+                so.AbsolutePosition = sp.AbsolutePosition;
+                so.AttachedAvatar = UUID.Zero;
+                rootPart.SetParentLocalId(0);
+                so.ClearPartAttachmentData();
+                rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive, m_scene.m_physicalPrim);
+                so.HasGroupChanged = true;
+                rootPart.Rezzed = DateTime.Now;
+                rootPart.RemFlag(PrimFlags.TemporaryOnRez);
+                so.AttachToBackup();
+                m_scene.EventManager.TriggerParcelPrimCountTainted();
+                rootPart.ScheduleFullUpdate();
+                rootPart.ClearUndoState();
+
+                List<UUID> uuids = new List<UUID>();
+                uuids.Add(inventoryID);
+                m_scene.InventoryService.DeleteItems(sp.UUID, uuids);
+                sp.ControllingClient.SendRemoveInventoryItem(inventoryID);
             }
-        }
 
-        /// <summary>
-        /// Detach the given scene object to the ground.
-        /// </summary>
-        /// <remarks>
-        /// The caller has to take care of all the other work in updating avatar appearance, inventory, etc.
-        /// </remarks>
-        /// <param name="so">The scene object to detach.</param>
-        /// <param name="sp">The scene presence from which the scene object is being detached.</param>
-        private void DetachSceneObjectToGround(SceneObjectGroup so, ScenePresence sp)
-        {
-            SceneObjectPart rootPart = so.RootPart;
-
-            rootPart.FromItemID = UUID.Zero;
-            so.AbsolutePosition = sp.AbsolutePosition;
-            so.AttachedAvatar = UUID.Zero;
-            rootPart.SetParentLocalId(0);
-            so.ClearPartAttachmentData();
-            rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive, m_scene.m_physicalPrim);
-            so.HasGroupChanged = true;
-            rootPart.Rezzed = DateTime.Now;
-            rootPart.RemFlag(PrimFlags.TemporaryOnRez);
-            so.AttachToBackup();
-            m_scene.EventManager.TriggerParcelPrimCountTainted();
-            rootPart.ScheduleFullUpdate();
-            rootPart.ClearUndoState();
+            m_scene.EventManager.TriggerOnAttach(so.LocalId, so.UUID, UUID.Zero);
         }
-        
-        // What makes this method odd and unique is it tries to detach using an UUID....     Yay for standards.
-        // To LocalId or UUID, *THAT* is the question. How now Brown UUID??
-        private void DetachSingleAttachmentToInv(UUID itemID, IScenePresence sp)
-        {
-//            m_log.DebugFormat("[ATTACHMENTS MODULE]: Detaching item {0} to inventory for {1}", itemID, sp.Name);
-
-            if (itemID == UUID.Zero) // If this happened, someone made a mistake....
-                return;
-
-            // We can NOT use the dictionries here, as we are looking
-            // for an entity by the fromAssetID, which is NOT the prim UUID
-            EntityBase[] detachEntities = m_scene.GetEntities();
-            SceneObjectGroup group;
 
+        public void DetachSingleAttachmentToInv(IScenePresence sp, UUID itemID)
+        {
             lock (sp.AttachmentsSyncLock)
             {
-                foreach (EntityBase entity in detachEntities)
-                {
-                    if (entity is SceneObjectGroup)
-                    {
-                                                group = (SceneObjectGroup)entity;                        if (group.GetFromItemID() == itemID)                        {                        m_scene.EventManager.TriggerOnAttach(group.LocalId, itemID, UUID.Zero);
-                        // CM / XMREngine!!!! Needed to conclude attach event
-                        //SceneObjectSerializer.ToOriginalXmlFormat(group);
-                        group.DetachToInventoryPrep();
-                        m_log.Debug("[ATTACHMENTS MODULE]: Saving attachpoint: " + ((uint)group.GetAttachmentPoint()).ToString());
+                // Save avatar attachment information
+                m_log.Debug("[ATTACHMENTS MODULE]: Detaching from UserID: " + sp.UUID + ", ItemID: " + itemID);
 
-                            // Prepare sog for storage
-                            group.AttachedAvatar = UUID.Zero;
-                            group.RootPart.SetParentLocalId(0);
-                            group.IsAttachment = false;
-                            group.AbsolutePosition = group.RootPart.AttachedPos;
-
-                            UpdateKnownItem(sp.ControllingClient, group);
-                            m_scene.DeleteSceneObject(group, false);
+                bool changed = sp.Appearance.DetachAttachment(itemID);
+                if (changed && m_scene.AvatarFactory != null)
+                    m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID);
 
-                            return;
-                        }
-                    }
-                }
+                DetachSingleAttachmentToInvInternal(sp, itemID);
             }
         }
         
         public void UpdateAttachmentPosition(SceneObjectGroup sog, Vector3 pos)
         {
+            if (!Enabled)
+                return;
+
             // First we save the
             // attachment point information, then we update the relative 
             // positioning. Then we have to mark the object as NOT an
@@ -717,7 +424,37 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             sog.AttachmentPoint = attachmentPoint;
             sog.HasGroupChanged = true;            
         }
-        
+
+        #endregion
+
+        #region AttachmentModule private methods
+
+        // This is public but is not part of the IAttachmentsModule interface.
+        // RegionCombiner module needs to poke at it to deliver client events.
+        // This breaks the encapsulation of the module and should get fixed somehow. 
+        public void SubscribeToClientEvents(IClientAPI client)
+        {
+            client.OnRezSingleAttachmentFromInv += Client_OnRezSingleAttachmentFromInv;
+            client.OnRezMultipleAttachmentsFromInv += Client_OnRezMultipleAttachmentsFromInv;
+            client.OnObjectAttach += Client_OnObjectAttach;
+            client.OnObjectDetach += Client_OnObjectDetach;
+            client.OnDetachAttachmentIntoInv += Client_OnDetachAttachmentIntoInv;
+            client.OnObjectDrop += Client_OnObjectDrop;
+        }
+
+        // This is public but is not part of the IAttachmentsModule interface.
+        // RegionCombiner module needs to poke at it to deliver client events.
+        // This breaks the encapsulation of the module and should get fixed somehow. 
+        public void UnsubscribeFromClientEvents(IClientAPI client)
+        {
+            client.OnRezSingleAttachmentFromInv -= Client_OnRezSingleAttachmentFromInv;
+            client.OnRezMultipleAttachmentsFromInv -= Client_OnRezMultipleAttachmentsFromInv;
+            client.OnObjectAttach -= Client_OnObjectAttach;
+            client.OnObjectDetach -= Client_OnObjectDetach;
+            client.OnDetachAttachmentIntoInv -= Client_OnDetachAttachmentIntoInv;
+            client.OnObjectDrop -= Client_OnObjectDrop;
+        }
+
         /// <summary>
         /// Update the attachment asset for the new sog details if they have changed.
         /// </summary>
@@ -725,9 +462,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// This is essential for preserving attachment attributes such as permission.  Unlike normal scene objects,
         /// these details are not stored on the region.
         /// </remarks>
-        /// <param name="remoteClient"></param>
+        /// <param name="sp"></param>
         /// <param name="grp"></param>
-        private void UpdateKnownItem(IClientAPI remoteClient, SceneObjectGroup grp)
+        private void UpdateKnownItem(IScenePresence sp, SceneObjectGroup grp)
         {
             if (grp.HasGroupChanged || grp.ContainsScripts())
             {
@@ -737,7 +474,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
                 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp);
 
-                InventoryItemBase item = new InventoryItemBase(grp.GetFromItemID(), remoteClient.AgentId);
+                InventoryItemBase item = new InventoryItemBase(grp.GetFromItemID(), sp.UUID);
                 item = m_scene.InventoryService.GetItem(item);
 
                 if (item != null)
@@ -747,7 +484,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                         grp.GetPartDescription(grp.LocalId),
                         (sbyte)AssetType.Object,
                         Utils.StringToBytes(sceneObjectXml),
-                        remoteClient.AgentId);
+                        sp.UUID);
                     m_scene.AssetService.Store(asset);
 
                     item.AssetID = asset.FullID;
@@ -759,8 +496,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     m_scene.InventoryService.UpdateItem(item);
 
                     // this gets called when the agent logs off!
-                    if (remoteClient != null)
-                        remoteClient.SendInventoryItemCreateUpdate(item, 0);
+                    if (sp.ControllingClient != null)
+                        sp.ControllingClient.SendInventoryItemCreateUpdate(item, 0);
                 }
             }
             else
@@ -769,8 +506,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     "[ATTACHMENTS MODULE]: Don't need to update asset for unchanged attachment {0}, attachpoint {1}",
                     grp.UUID, grp.AttachmentPoint);
             }
-        } 
-        
+        }
+
         /// <summary>
         /// Attach this scene object to the given avatar.
         /// </summary>
@@ -784,19 +521,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// <param name="attachOffset"></param>
         /// <param name="silent"></param>
         private void AttachToAgent(
-            IScenePresence avatar, SceneObjectGroup so, uint attachmentpoint, Vector3 attachOffset, bool silent)
+            IScenePresence sp, SceneObjectGroup so, uint attachmentpoint, Vector3 attachOffset, bool silent)
         {
-//            m_log.DebugFormat(
-//                "[ATTACHMENTS MODULE]: Adding attachment {0} to avatar {1} in pt {2} pos {3} {4}",
-//                so.Name, avatar.Name, attachmentpoint, attachOffset, so.RootPart.AttachedPos);
-                              
+            //            m_log.DebugFormat(
+            //                "[ATTACHMENTS MODULE]: Adding attachment {0} to avatar {1} in pt {2} pos {3} {4}",
+            //                so.Name, avatar.Name, attachmentpoint, attachOffset, so.RootPart.AttachedPos);
+
             so.DetachFromBackup();
 
             // Remove from database and parcel prim count
             m_scene.DeleteFromStorage(so.UUID);
             m_scene.EventManager.TriggerParcelPrimCountTainted();
 
-            so.AttachedAvatar = avatar.UUID;
+            so.AttachedAvatar = sp.UUID;
 
             if (so.RootPart.PhysActor != null)
             {
@@ -807,17 +544,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             so.AbsolutePosition = attachOffset;
             so.RootPart.AttachedPos = attachOffset;
             so.IsAttachment = true;
-            so.RootPart.SetParentLocalId(avatar.LocalId);
+            so.RootPart.SetParentLocalId(sp.LocalId);
             so.AttachmentPoint = attachmentpoint;
 
-            avatar.AddAttachment(so);
+            sp.AddAttachment(so);
 
             if (!silent)
             {
                 so.IsSelected = false; // fudge....
                 so.ScheduleGroupForFullUpdate();
             }
-                            
+
             // In case it is later dropped again, don't let
             // it get cleaned up
             so.RootPart.RemFlag(PrimFlags.TemporaryOnRez);
@@ -829,19 +566,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// <param name="remoteClient"></param>
         /// <param name="grp"></param>
         /// <returns>The user inventory item created that holds the attachment.</returns>
-        private InventoryItemBase AddSceneObjectAsNewAttachmentInInv(IClientAPI remoteClient, SceneObjectGroup grp)
+        private InventoryItemBase AddSceneObjectAsNewAttachmentInInv(IScenePresence sp, SceneObjectGroup grp)
         {
-//            m_log.DebugFormat(
-//                "[ATTACHMENTS MODULE]: Called AddSceneObjectAsAttachment for object {0} {1} for {2}",
-//                grp.Name, grp.LocalId, remoteClient.Name);
-            uint regionSize = Constants.RegionSize; //Avoid VS error "The operation overflows at compile time in checked mode"
+            //            m_log.DebugFormat(
+            //                "[ATTACHMENTS MODULE]: Called AddSceneObjectAsAttachment for object {0} {1} for {2}",
+            //                grp.Name, grp.LocalId, remoteClient.Name);
+
             Vector3 inventoryStoredPosition = new Vector3
                    (((grp.AbsolutePosition.X > (int)Constants.RegionSize)
-                         ? regionSize - 6
+                         ? (float)Constants.RegionSize - 6
                          : grp.AbsolutePosition.X)
                     ,
                     (grp.AbsolutePosition.Y > (int)Constants.RegionSize)
-                        ? regionSize - 6
+                        ? (float)Constants.RegionSize - 6
                         : grp.AbsolutePosition.Y,
                     grp.AbsolutePosition.Z);
 
@@ -862,14 +599,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 grp.GetPartDescription(grp.LocalId),
                 (sbyte)AssetType.Object,
                 Utils.StringToBytes(sceneObjectXml),
-                remoteClient.AgentId);
+                sp.UUID);
 
             m_scene.AssetService.Store(asset);
 
             InventoryItemBase item = new InventoryItemBase();
             item.CreatorId = grp.RootPart.CreatorID.ToString();
             item.CreatorData = grp.RootPart.CreatorData;
-            item.Owner = remoteClient.AgentId;
+            item.Owner = sp.UUID;
             item.ID = UUID.Random();
             item.AssetID = asset.FullID;
             item.Description = asset.Description;
@@ -877,13 +614,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             item.AssetType = asset.Type;
             item.InvType = (int)InventoryType.Object;
 
-            InventoryFolderBase folder = m_scene.InventoryService.GetFolderForType(remoteClient.AgentId, AssetType.Object);
+            InventoryFolderBase folder = m_scene.InventoryService.GetFolderForType(sp.UUID, AssetType.Object);
             if (folder != null)
                 item.Folder = folder.ID;
             else // oopsies
                 item.Folder = UUID.Zero;
 
-            if ((remoteClient.AgentId != grp.RootPart.OwnerID) && m_scene.Permissions.PropagatePermissions())
+            if ((sp.UUID != grp.RootPart.OwnerID) && m_scene.Permissions.PropagatePermissions())
             {
                 item.BasePermissions = grp.RootPart.NextOwnerMask;
                 item.CurrentPermissions = grp.RootPart.NextOwnerMask;
@@ -906,15 +643,304 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             if (m_scene.AddInventoryItem(item))
             {
-                remoteClient.SendInventoryItemCreateUpdate(item, 0);
+                sp.ControllingClient.SendInventoryItemCreateUpdate(item, 0);
             }
             else
             {
                 if (m_dialogModule != null)
-                    m_dialogModule.SendAlertToUser(remoteClient, "Operation failed");
+                    m_dialogModule.SendAlertToUser(sp.ControllingClient, "Operation failed");
             }
 
             return item;
         }
+
+        // What makes this method odd and unique is it tries to detach using an UUID....     Yay for standards.
+        // To LocalId or UUID, *THAT* is the question. How now Brown UUID??
+        private void DetachSingleAttachmentToInvInternal(IScenePresence sp, UUID itemID)
+        {
+            //            m_log.DebugFormat("[ATTACHMENTS MODULE]: Detaching item {0} to inventory for {1}", itemID, sp.Name);
+
+            if (itemID == UUID.Zero) // If this happened, someone made a mistake....
+                return;
+
+            // We can NOT use the dictionries here, as we are looking
+            // for an entity by the fromAssetID, which is NOT the prim UUID
+            EntityBase[] detachEntities = m_scene.GetEntities();
+            SceneObjectGroup group;
+
+            lock (sp.AttachmentsSyncLock)
+            {
+                foreach (EntityBase entity in detachEntities)
+                {
+                    if (entity is SceneObjectGroup)
+                    {
+                        group = (SceneObjectGroup)entity;
+                        if (group.GetFromItemID() == itemID)
+                        {
+                            m_scene.EventManager.TriggerOnAttach(group.LocalId, itemID, UUID.Zero);
+                            sp.RemoveAttachment(group);
+
+                            // Prepare sog for storage
+                            group.AttachedAvatar = UUID.Zero;
+                            group.RootPart.SetParentLocalId(0);
+                            group.IsAttachment = false;
+                            group.AbsolutePosition = group.RootPart.AttachedPos;
+
+                            UpdateKnownItem(sp, group);
+                            m_scene.DeleteSceneObject(group, false);
+
+                            return;
+                        }
+                    }
+                }
+            }
+        }
+
+        protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal(
+            IScenePresence sp, UUID itemID, UUID assetID, uint attachmentPt, XmlDocument doc)
+        {
+            IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>();
+            if (invAccess != null)
+            {
+                lock (sp.AttachmentsSyncLock)
+                {
+                    SceneObjectGroup objatt;
+    
+                    if (itemID != UUID.Zero)
+                        objatt = invAccess.RezObject(sp.ControllingClient,
+                            itemID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
+                            false, false, sp.UUID, true);
+                    else
+                        objatt = invAccess.RezObject(sp.ControllingClient,
+                            null, assetID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
+                            false, false, sp.UUID, true);
+    
+    //                m_log.DebugFormat(
+    //                    "[ATTACHMENTS MODULE]: Retrieved single object {0} for attachment to {1} on point {2}",
+    //                    objatt.Name, remoteClient.Name, AttachmentPt);
+                    
+                    if (objatt != null)
+                    {
+                        // HasGroupChanged is being set from within RezObject.  Ideally it would be set by the caller.
+                        objatt.HasGroupChanged = false;
+                        bool tainted = false;
+                        if (attachmentPt != 0 && attachmentPt != objatt.AttachmentPoint)
+                            tainted = true;
+    
+                        // This will throw if the attachment fails
+                        try
+                        {
+                            AttachObject(sp, objatt, attachmentPt, false);
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.ErrorFormat(
+                                "[ATTACHMENTS MODULE]: Failed to attach {0} {1} for {2}, exception {3}{4}",
+                                objatt.Name, objatt.UUID, sp.Name, e.Message, e.StackTrace);
+    
+                            // Make sure the object doesn't stick around and bail
+                            sp.RemoveAttachment(objatt);
+                            m_scene.DeleteSceneObject(objatt, false);
+                            return null;
+                        }
+                        
+                        if (tainted)
+                            objatt.HasGroupChanged = true;
+    
+                        // Fire after attach, so we don't get messy perms dialogs
+                        // 4 == AttachedRez
+                        objatt.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 4);
+                        objatt.ResumeScripts();
+    
+                        // Do this last so that event listeners have access to all the effects of the attachment
+                        m_scene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, sp.UUID);
+
+                        return objatt;
+                    }
+                    else
+                    {
+                        m_log.WarnFormat(
+                            "[ATTACHMENTS MODULE]: Could not retrieve item {0} for attaching to avatar {1} at point {2}",
+                            itemID, sp.Name, attachmentPt);
+                    }
+
+                    if (doc != null)
+                    {
+                        objatt.LoadScriptState(doc);
+                        objatt.ResetOwnerChangeFlag();
+                    }
+
+                    // Fire after attach, so we don't get messy perms dialogs
+                    // 4 == AttachedRez
+                    objatt.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 4);
+                    objatt.ResumeScripts();
+
+                    // Do this last so that event listeners have access to all the effects of the attachment
+                    m_scene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, sp.UUID);
+                }
+            }
+            
+            return null;
+        }
+
+        /// <summary>
+        /// Update the user inventory to reflect an attachment
+        /// </summary>
+        /// <param name="sp"></param>
+        /// <param name="AttachmentPt"></param>
+        /// <param name="itemID"></param>
+        /// <param name="att"></param>
+        private void ShowAttachInUserInventory(IScenePresence sp, uint AttachmentPt, UUID itemID, SceneObjectGroup att)
+        {
+            //            m_log.DebugFormat(
+            //                "[USER INVENTORY]: Updating attachment {0} for {1} at {2} using item ID {3}",
+            //                att.Name, sp.Name, AttachmentPt, itemID);
+
+            if (UUID.Zero == itemID)
+            {
+                m_log.Error("[ATTACHMENTS MODULE]: Unable to save attachment. Error inventory item ID.");
+                return;
+            }
+
+            if (0 == AttachmentPt)
+            {
+                m_log.Error("[ATTACHMENTS MODULE]: Unable to save attachment. Error attachment point.");
+                return;
+            }
+
+            InventoryItemBase item = new InventoryItemBase(itemID, sp.UUID);
+            item = m_scene.InventoryService.GetItem(item);
+            bool changed = sp.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID);
+            if (changed && m_scene.AvatarFactory != null)
+                m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID);
+        }
+
+        #endregion
+
+        #region Client Event Handlers
+
+        private ISceneEntity Client_OnRezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
+        {
+            if (!Enabled)
+                return null;
+
+            //            m_log.DebugFormat(
+            //                "[ATTACHMENTS MODULE]: Rezzing attachment to point {0} from item {1} for {2}",
+            //                (AttachmentPoint)AttachmentPt, itemID, remoteClient.Name);
+
+            ScenePresence sp = m_scene.GetScenePresence(remoteClient.AgentId);
+
+            if (sp == null)
+            {
+                m_log.ErrorFormat(
+                    "[ATTACHMENTS MODULE]: Could not find presence for client {0} {1} in RezSingleAttachmentFromInventory()",
+                    remoteClient.Name, remoteClient.AgentId);
+                return null;
+            }
+
+            return RezSingleAttachmentFromInventory(sp, itemID, AttachmentPt);
+        }
+
+        private void Client_OnRezMultipleAttachmentsFromInv(IClientAPI remoteClient, List<KeyValuePair<UUID, uint>> rezlist)
+        {
+            if (!Enabled)
+                return;
+
+            ScenePresence sp = m_scene.GetScenePresence(remoteClient.AgentId);
+            if (sp != null)
+                RezMultipleAttachmentsFromInventory(sp, rezlist);
+            else
+                m_log.ErrorFormat(
+                    "[ATTACHMENTS MODULE]: Could not find presence for client {0} {1} in RezMultipleAttachmentsFromInventory()",
+                    remoteClient.Name, remoteClient.AgentId);
+        }
+
+        private void Client_OnObjectAttach(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent)
+        {
+            //            m_log.DebugFormat(
+            //                "[ATTACHMENTS MODULE]: Attaching object local id {0} to {1} point {2} from ground (silent = {3})",
+            //                objectLocalID, remoteClient.Name, AttachmentPt, silent);
+
+            if (!Enabled)
+                return;
+
+            try
+            {
+                ScenePresence sp = m_scene.GetScenePresence(remoteClient.AgentId);
+
+                if (sp == null)
+                {
+                    m_log.ErrorFormat(
+                        "[ATTACHMENTS MODULE]: Could not find presence for client {0} {1}", remoteClient.Name, remoteClient.AgentId);
+                    return;
+                }
+
+                // If we can't take it, we can't attach it!
+                SceneObjectPart part = m_scene.GetSceneObjectPart(objectLocalID);
+                if (part == null)
+                    return;
+
+                if (!m_scene.Permissions.CanTakeObject(part.UUID, remoteClient.AgentId))
+                {
+                    remoteClient.SendAgentAlertMessage(
+                        "You don't have sufficient permissions to attach this object", false);
+
+                    return;
+                }
+
+                // TODO: this short circuits multiple attachments functionality  in  LL viewer 2.1+ and should
+                // be removed when that functionality is implemented in opensim
+                AttachmentPt &= 0x7f;
+
+                // Calls attach with a Zero position
+                if (AttachObject(sp, part.ParentGroup, AttachmentPt, false))
+                {
+                    m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId);
+
+                    // Save avatar attachment information
+                    m_log.Debug(
+                        "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId
+                        + ", AttachmentPoint: " + AttachmentPt);
+
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[ATTACHMENTS MODULE]: exception upon Attach Object {0}{1}", e.Message, e.StackTrace);
+            }
+        }
+
+        private void Client_OnObjectDetach(uint objectLocalID, IClientAPI remoteClient)
+        {
+            if (!Enabled)
+                return;
+
+            ScenePresence sp = m_scene.GetScenePresence(remoteClient.AgentId);
+            SceneObjectGroup group = m_scene.GetGroupByPrim(objectLocalID);
+            if (sp != null && group != null)
+                DetachSingleAttachmentToInv(sp, group.GetFromItemID());
+        }
+
+        private void Client_OnDetachAttachmentIntoInv(UUID itemID, IClientAPI remoteClient)
+        {
+            if (!Enabled)
+                return;
+
+            ScenePresence sp = m_scene.GetScenePresence(remoteClient.AgentId);
+            if (sp != null)
+                DetachSingleAttachmentToInv(sp, itemID);
+        }
+
+        private void Client_OnObjectDrop(uint soLocalId, IClientAPI remoteClient)
+        {
+            if (!Enabled)
+                return;
+
+            ScenePresence sp = m_scene.GetScenePresence(remoteClient.AgentId);
+            if (sp != null)
+                DetachSingleAttachmentToGround(sp, soLocalId);
+        }
+
+        #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index ff3358f..86cfb32 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 
             SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, attName).ParentGroup;
 
-            m_attMod.AttachObject(m_presence.ControllingClient, so, (uint)AttachmentPoint.Chest, false);
+            m_attMod.AttachObject(m_presence, so, (uint)AttachmentPoint.Chest, false);
 
             // Check status on scene presence
             Assert.That(m_presence.HasAttachments(), Is.True);
@@ -140,7 +140,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
                 scene, attName, attItemId, attAssetId, m_presence.UUID, InventoryType.Object);
 
             m_attMod.RezSingleAttachmentFromInventory(
-                m_presence.ControllingClient, attItemId, (uint)AttachmentPoint.Chest);
+                m_presence, attItemId, (uint)AttachmentPoint.Chest);
 
             // Check scene presence status
             Assert.That(m_presence.HasAttachments(), Is.True);
@@ -174,8 +174,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
                 scene, attName, attItemId, attAssetId, m_presence.UUID, InventoryType.Object);
 
             ISceneEntity so = m_attMod.RezSingleAttachmentFromInventory(
-                m_presence.ControllingClient, attItemId, (uint)AttachmentPoint.Chest);
-            m_attMod.DetachSingleAttachmentToGround(so.LocalId, m_presence.ControllingClient);
+                m_presence, attItemId, (uint)AttachmentPoint.Chest);
+            m_attMod.DetachSingleAttachmentToGround(m_presence, so.LocalId);
 
             // Check scene presence status
             Assert.That(m_presence.HasAttachments(), Is.False);
@@ -208,8 +208,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
                 scene, attName, attItemId, attAssetId, m_presence.UUID, InventoryType.Object);
 
             m_attMod.RezSingleAttachmentFromInventory(
-                m_presence.ControllingClient, attItemId, (uint)AttachmentPoint.Chest);
-            m_attMod.DetachSingleAttachmentToInv(attItemId, m_presence.ControllingClient);
+                m_presence, attItemId, (uint)AttachmentPoint.Chest);
+            m_attMod.DetachSingleAttachmentToInv(m_presence, attItemId);
 
             // Check status on scene presence
             Assert.That(m_presence.HasAttachments(), Is.False);