Resolve merge commits, stage 1

1 files changed, 389 insertions, 124 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 47476a9..8be0455 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -47,7 +47,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
-        protected Scene m_scene = null;
+        private Scene m_scene;
+        private IDialogModule m_dialogModule;
         
         public string Name { get { return "Attachments Module"; } }
         public Type ReplaceableInterface { get { return null; } }
@@ -57,6 +58,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         public void AddRegion(Scene scene)
         {
             m_scene = scene;
+            m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>();
             m_scene.RegisterModuleInterface<IAttachmentsModule>(this);
             m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
             // TODO: Should probably be subscribing to CloseClient too, but this doesn't yet give us IClientAPI
@@ -81,7 +83,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             client.OnRezMultipleAttachmentsFromInv += RezMultipleAttachmentsFromInventory;
             client.OnObjectAttach += AttachObject;
             client.OnObjectDetach += DetachObject;
-            client.OnDetachAttachmentIntoInv += ShowDetachInUserInventory;
+            client.OnDetachAttachmentIntoInv += DetachSingleAttachmentToInv;
+            client.OnObjectDrop += DetachSingleAttachmentToGround;
         }
         
         public void UnsubscribeFromClientEvents(IClientAPI client)
@@ -90,7 +93,77 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             client.OnRezMultipleAttachmentsFromInv -= RezMultipleAttachmentsFromInventory;
             client.OnObjectAttach -= AttachObject;
             client.OnObjectDetach -= DetachObject;
-            client.OnDetachAttachmentIntoInv -= ShowDetachInUserInventory;
+            client.OnDetachAttachmentIntoInv -= DetachSingleAttachmentToInv;
+            client.OnObjectDrop -= DetachSingleAttachmentToGround;
+        }
+
+        /// <summary>
+        /// 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>
+        public void RezAttachments(IScenePresence sp)
+        {
+            if (null == sp.Appearance)
+            {
+                m_log.WarnFormat("[ATTACHMENTS MODULE]: Appearance has not been initialized for agent {0}", sp.UUID);
+                return;
+            }
+
+            List<AvatarAttachment> attachments = sp.Appearance.GetAttachments();
+            foreach (AvatarAttachment attach in attachments)
+            {
+                uint p = (uint)attach.AttachPoint;
+
+//                m_log.DebugFormat(
+//                    "[ATTACHMENTS MODULE]: Doing initial rez of attachment with itemID {0}, assetID {1}, point {2} for {3} in {4}",
+//                    attach.ItemID, attach.AssetID, p, sp.Name, m_scene.RegionInfo.RegionName);
+
+                // For some reason assetIDs are being written as Zero's in the DB -- need to track tat down
+                // But they're not used anyway, the item is being looked up for now, so let's proceed.
+                //if (UUID.Zero == assetID) 
+                //{
+                //    m_log.DebugFormat("[ATTACHMENT]: Cannot rez attachment in point {0} with itemID {1}", p, itemID);
+                //    continue;
+                //}
+
+                try
+                {
+                    // If we're an NPC then skip all the item checks and manipulations since we don't have an
+                    // inventory right now.
+                    if (sp.PresenceType == PresenceType.Npc)
+                        RezSingleAttachmentFromInventoryInternal(sp, UUID.Zero, attach.AssetID, p);
+                    else
+                        RezSingleAttachmentFromInventory(sp.ControllingClient, attach.ItemID, p);
+                }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat("[ATTACHMENTS MODULE]: Unable to rez attachment: {0}{1}", e.Message, e.StackTrace);
+                }
+            }
+        }
+
+        public void SaveChangedAttachments(IScenePresence sp)
+        {
+            foreach (SceneObjectGroup grp in sp.GetAttachments())
+            {
+                if (grp.HasGroupChanged) // Resizer scripts?
+                {
+                    grp.IsAttachment = false;
+                    grp.AbsolutePosition = grp.RootPart.AttachedPos;
+                    UpdateKnownItem(sp.ControllingClient, grp, grp.GetFromItemID(), grp.OwnerID);
+                    grp.IsAttachment = true;
+                }
+            }
+        }
+
+        public void DeleteAttachmentsFromScene(IScenePresence sp, bool silent)
+        {
+            foreach (SceneObjectGroup sop in sp.GetAttachments())
+            {
+                sop.Scene.DeleteSceneObject(sop, silent);
+            }
+
+            sp.ClearAttachments();
         }
         
         /// <summary>
@@ -102,10 +175,21 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// <param name="silent"></param>
         public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent)
         {
-            m_log.Debug("[ATTACHMENTS MODULE]: Invoking AttachObject");
+//            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)
@@ -131,7 +215,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 AttachmentPt &= 0x7f;
 
                 // Calls attach with a Zero position
-                if (AttachObject(remoteClient, part.ParentGroup, AttachmentPt, false))
+                if (AttachObject(sp, part.ParentGroup, AttachmentPt, false))
                 {
                     m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId);
 
@@ -144,73 +228,94 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[ATTACHMENTS MODULE]: exception upon Attach Object {0}", 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)
+        {
+//            m_log.DebugFormat(
+//                "[ATTACHMENTS MODULE]: Attaching object {0} {1} to {2} point {3} from ground (silent = {4})",
+//                group.Name, group.LocalId, sp.Name, AttachmentPt, silent);
+
+            if (sp.GetAttachments(attachmentPt).Contains(group))
+            {
+//                m_log.WarnFormat(
+//                    "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since it's already attached",
+//                    group.Name, group.LocalId, sp.Name, AttachmentPt);
+
+                return false;
+            }
+
             Vector3 attachPos = group.AbsolutePosition;
 
             // 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;
+            attachmentPt &= 0x7f;
             
             // If the attachment point isn't the same as the one previously used
             // set it's offset position = 0 so that it appears on the attachment point
             // and not in a weird location somewhere unknown.
-            if (AttachmentPt != 0 && AttachmentPt != (uint)group.GetAttachmentPoint())
+            if (attachmentPt != 0 && attachmentPt != group.AttachmentPoint)
             {
                 attachPos = Vector3.Zero;
             }
 
             // AttachmentPt 0 means the client chose to 'wear' the attachment.
-            if (AttachmentPt == 0)
+            if (attachmentPt == 0)
             {
                 // Check object for stored attachment point
-                AttachmentPt = (uint)group.GetAttachmentPoint();
+                attachmentPt = group.AttachmentPoint;
             }
 
             // if we still didn't find a suitable attachment point.......
-            if (AttachmentPt == 0)
+            if (attachmentPt == 0)
             {
                 // Stick it on left hand with Zero Offset from the attachment point.
-                AttachmentPt = (uint)AttachmentPoint.LeftHand;
+                attachmentPt = (uint)AttachmentPoint.LeftHand;
                 attachPos = Vector3.Zero;
             }
 
-            group.SetAttachmentPoint((byte)AttachmentPt);
+            group.AttachmentPoint = attachmentPt;
             group.AbsolutePosition = attachPos;
 
             // Remove any previous attachments
-            ScenePresence sp = m_scene.GetScenePresence(remoteClient.AgentId);
             UUID itemID = UUID.Zero;
-            if (sp != null)
-            {
-                foreach (SceneObjectGroup grp in sp.Attachments)
-                {
-                    if (grp.GetAttachmentPoint() == (byte)AttachmentPt)
-                    {
-                        itemID = grp.GetFromItemID();
-                        break;
-                    }
-                }
-                if (itemID != UUID.Zero)
-                    DetachSingleAttachmentToInv(itemID, remoteClient);
-            }
 
-            if (group.GetFromItemID() == UUID.Zero)
-            {
-                m_scene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemID);
-            }
-            else
+            List<SceneObjectGroup> attachments = sp.GetAttachments(attachmentPt);
+
+            // At the moment we can only deal with a single attachment
+            // We also don't want to do any of the inventory operations for an NPC.
+            if (sp.PresenceType != PresenceType.Npc)
             {
+                if (attachments.Count != 0)
+                    itemID = attachments[0].GetFromItemID();
+    
+                if (itemID != UUID.Zero)
+                    DetachSingleAttachmentToInv(itemID, sp);
+    
                 itemID = group.GetFromItemID();
+                if (itemID == UUID.Zero)
+                    itemID = AddSceneObjectAsAttachment(sp.ControllingClient, group).ID;
+    
+                ShowAttachInUserInventory(sp, attachmentPt, itemID, group);
             }
 
-            ShowAttachInUserInventory(remoteClient, AttachmentPt, itemID, group);
-
-            AttachToAgent(sp, group, AttachmentPt, attachPos, silent);
+            AttachToAgent(sp, group, attachmentPt, attachPos, silent);
 
             return true;
         }
@@ -226,12 +331,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             }
         }
         
-        public UUID RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
+        public ISceneEntity RezSingleAttachmentFromInventory(
+            IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
         {
             return RezSingleAttachmentFromInventory(remoteClient, itemID, AttachmentPt, true);
         }
 
-        public UUID RezSingleAttachmentFromInventory(
+        public ISceneEntity RezSingleAttachmentFromInventory(
             IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus)
         {
             return RezSingleAttachmentFromInventory(remoteClient, itemID, AttachmentPt, true, null);
@@ -239,7 +345,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
         public UUID RezSingleAttachmentFromInventory(
             IClientAPI remoteClient, 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);                return null;            }            
             // 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;
@@ -249,15 +358,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             if (updateInventoryStatus)
             {
                 if (att == null)
-                    ShowDetachInUserInventory(itemID, remoteClient);
+                    DetachSingleAttachmentToInv(itemID, sp.ControllingClient);
                 else
-                    ShowAttachInUserInventory(att, remoteClient, itemID, AttachmentPt);
+                    ShowAttachInUserInventory(att, sp, itemID, AttachmentPt);
             }
 
-            if (null == att)
-                return UUID.Zero;
-            else
-                return att.UUID;
+            return att;
         }
 
         protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal(
@@ -266,12 +372,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>();
             if (invAccess != null)
             {
-                SceneObjectGroup objatt = invAccess.RezObject(remoteClient,
-                    itemID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
-                    false, false, remoteClient.AgentId, true);
+                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}", 
+//                    "[ATTACHMENTS MODULE]: Retrieved single object {0} for attachment to {1} on point {2}",
 //                    objatt.Name, remoteClient.Name, AttachmentPt);
                 
                 if (objatt != null)
@@ -281,17 +394,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     // since scripts aren't running yet. So, clear it here.
                     objatt.HasGroupChanged = false;
                     bool tainted = false;
-                    if (AttachmentPt != 0 && AttachmentPt != objatt.GetAttachmentPoint())
+                    if (attachmentPt != 0 && attachmentPt != objatt.AttachmentPoint)
                         tainted = true;
 
                     // This will throw if the attachment fails
                     try
                     {
-                        AttachObject(remoteClient, objatt, AttachmentPt, false);
+                        AttachObject(sp, objatt, attachmentPt, false);
                     }
-                    catch
+                    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;
                     }
@@ -311,13 +429,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     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, remoteClient.AgentId);
+                    m_scene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, sp.UUID);
                 }
                 else
                 {
                     m_log.WarnFormat(
                         "[ATTACHMENTS MODULE]: Could not retrieve item {0} for attaching to avatar {1} at point {2}", 
-                        itemID, remoteClient.Name, AttachmentPt);
+                        itemID, sp.Name, attachmentPt);
                 }
                 
                 return objatt;
@@ -330,31 +448,30 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// Update the user inventory to the attachment of an item
         /// </summary>
         /// <param name="att"></param>
-        /// <param name="remoteClient"></param>
+        /// <param name="sp"></param>
         /// <param name="itemID"></param>
-        /// <param name="AttachmentPt"></param>
+        /// <param name="attachmentPoint"></param>
         /// <returns></returns>
-        protected UUID ShowAttachInUserInventory(
-            SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
+        private UUID ShowAttachInUserInventory(
+            SceneObjectGroup att, IScenePresence sp, UUID itemID, uint attachmentPoint)
         {
 //            m_log.DebugFormat(
-//                "[ATTACHMENTS MODULE]: Updating inventory of {0} to show attachment of {1} (item ID {2})", 
-//                remoteClient.Name, att.Name, itemID);
+//                "[ATTACHMENTS MODULE]: Updating inventory of {0} to show attachment of {1} {2} (item ID {3}) at {4}",
+//                sp.Name, att.Name, att.LocalId, itemID, AttachmentPt);
             
             if (!att.IsDeleted)
-                AttachmentPt = att.RootPart.AttachmentPoint;
+                attachmentPoint = att.AttachmentPoint;
 
             ScenePresence presence;
             if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence))
             {
-                InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
+            InventoryItemBase item = new InventoryItemBase(itemID, sp.UUID);
                 if (m_scene.InventoryService != null)
                     item = m_scene.InventoryService.GetItem(item);
 
-                bool changed = presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID);
-                if (changed && m_scene.AvatarFactory != null)
-                    m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
-            }
+            bool changed = sp.Appearance.SetAttachment((int)attachmentPoint, itemID, item.AssetID);
+            if (changed && m_scene.AvatarFactory != null)
+                m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID);
             
             return att.UUID;
         }
@@ -362,12 +479,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// <summary>
         /// Update the user inventory to reflect an attachment
         /// </summary>
-        /// <param name="remoteClient"></param>
+        /// <param name="sp"></param>
         /// <param name="AttachmentPt"></param>
         /// <param name="itemID"></param>
         /// <param name="att"></param>
-        protected void ShowAttachInUserInventory(
-            IClientAPI remoteClient, uint AttachmentPt, UUID itemID, SceneObjectGroup att)
+        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}", 
@@ -390,23 +507,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 m_log.Error("[ATTACHMENTS MODULE]: Unable to save attachment for a prim without the rootpart!");
                 return;
             }
+            InventoryItemBase item = new InventoryItemBase(itemID, sp.UUID);
 
-            ScenePresence presence;
-            if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence))
-            {
-                // XXYY!!
-                InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
-                if (item == null)
-                    m_log.Error("[ATTACHMENT]: item == null");
-                if (m_scene == null)
-                    m_log.Error("[ATTACHMENT]: m_scene == null");
-                if (m_scene.InventoryService == null)
-                    m_log.Error("[ATTACHMENT]: m_scene.InventoryService == null");
-                item = m_scene.InventoryService.GetItem(item);
-                bool changed = presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID);
-                if (changed && m_scene.AvatarFactory != null)
-                    m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
-            }
+
+
+
+
+
+            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)
@@ -414,12 +525,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             SceneObjectGroup group = m_scene.GetGroupByPrim(objectLocalID);
             if (group != null)
             {
-                //group.DetachToGround();
-                ShowDetachInUserInventory(group.GetFromItemID(), remoteClient);
+                DetachSingleAttachmentToInv(group.GetFromItemID(), remoteClient);
             }
         }
         
-        public void ShowDetachInUserInventory(UUID itemID, IClientAPI remoteClient)
+        public void DetachSingleAttachmentToInv(UUID itemID, IClientAPI remoteClient)
         {
             ScenePresence presence;
             if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence))
@@ -430,34 +540,44 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 bool changed = presence.Appearance.DetachAttachment(itemID);
                 if (changed && m_scene.AvatarFactory != null)
                     m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
-            }
 
-            DetachSingleAttachmentToInv(itemID, remoteClient);
+                DetachSingleAttachmentToInv(itemID, presence);
+            }
         }
 
-        public void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient)
+        public void DetachSingleAttachmentToGround(uint soLocalId, IClientAPI remoteClient)
         {
-            SceneObjectPart part = m_scene.GetSceneObjectPart(itemID);
-            if (part == null || part.ParentGroup == null)
+//            m_log.DebugFormat(
+//                "[ATTACHMENTS MODULE]: DetachSingleAttachmentToGround() for {0}, object {1}",
+//                remoteClient.Name, sceneObjectID);
+
+            SceneObjectGroup so = m_scene.GetGroupByPrim(soLocalId);
+
+            if (so == null)
                 return;
 
-            if (part.ParentGroup.RootPart.AttachedAvatar != remoteClient.AgentId)
+            if (so.AttachedAvatar != remoteClient.AgentId)
                 return;
 
-            UUID inventoryID = part.ParentGroup.GetFromItemID();
+            UUID inventoryID = so.GetFromItemID();
+
+//            m_log.DebugFormat(
+//                "[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))
             {
                 if (!m_scene.Permissions.CanRezObject(
-                    part.ParentGroup.PrimCount, remoteClient.AgentId, presence.AbsolutePosition))
+                    so.PrimCount, remoteClient.AgentId, presence.AbsolutePosition))
                     return;
 
-                bool changed = presence.Appearance.DetachAttachment(itemID);
+                bool changed = presence.Appearance.DetachAttachment(inventoryID);
                 if (changed && m_scene.AvatarFactory != null)
                     m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
 
-                part.ParentGroup.DetachToGround();
+                presence.RemoveAttachment(so);
+                DetachSceneObjectToGround(so, presence);
 
                 List<UUID> uuids = new List<UUID>();
                 uuids.Add(inventoryID);
@@ -465,12 +585,39 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 remoteClient.SendRemoveInventoryItem(inventoryID);
             }
 
-            m_scene.EventManager.TriggerOnAttach(part.ParentGroup.LocalId, itemID, UUID.Zero);
+            m_scene.EventManager.TriggerOnAttach(so.LocalId, so.UUID, UUID.Zero);
+        }
+
+        /// <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();
         }
         
         // 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??
-        protected void DetachSingleAttachmentToInv(UUID itemID, IClientAPI remoteClient)
+        private void DetachSingleAttachmentToInv(UUID itemID, IScenePresence sp)
         {
             if (itemID == UUID.Zero) // If this happened, someone made a mistake....
                 return;
@@ -493,27 +640,55 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                         group.DetachToInventoryPrep();
                         m_log.Debug("[ATTACHMENTS MODULE]: Saving attachpoint: " + ((uint)group.GetAttachmentPoint()).ToString());
 
-                        // If an item contains scripts, it's always changed.
-                        // This ensures script state is saved on detach
-                        foreach (SceneObjectPart p in group.Parts)
-                            if (p.Inventory.ContainsScripts())
-                                group.HasGroupChanged = true;
+                        // Prepare sog for storage
+                        group.AttachedAvatar = UUID.Zero;
+
+                        group.ForEachPart(
+                            delegate(SceneObjectPart part)
+                            {
+                                // If there are any scripts,
+                                // then always trigger a new object and state persistence in UpdateKnownItem()
+                                if (part.Inventory.ContainsScripts())
+                                    group.HasGroupChanged = true;
+                            }
+                        );
 
-                        UpdateKnownItem(remoteClient, group, group.GetFromItemID(), group.OwnerID);
+                        group.RootPart.SetParentLocalId(0);
+                        group.IsAttachment = false;
+                        group.AbsolutePosition = group.RootPart.AttachedPos;
+
+                        UpdateKnownItem(sp.ControllingClient, group, group.GetFromItemID(), group.OwnerID);
                         m_scene.DeleteSceneObject(group, false);
+
                         return;
                     }
                 }
             }
         }
         
+        public void UpdateAttachmentPosition(SceneObjectGroup sog, Vector3 pos)
+        {
+            // First we save the
+            // attachment point information, then we update the relative 
+            // positioning. Then we have to mark the object as NOT an
+            // attachment. This is necessary in order to correctly save
+            // and retrieve GroupPosition information for the attachment.
+            // Finally, we restore the object's attachment status.
+            uint attachmentPoint = sog.AttachmentPoint;
+            sog.UpdateGroupPosition(pos);
+            sog.IsAttachment = false;
+            sog.AbsolutePosition = sog.RootPart.AttachedPos;
+            sog.AttachmentPoint = attachmentPoint;
+            sog.HasGroupChanged = true;            
+        }
+        
         /// <summary>
         /// Update the attachment asset for the new sog details if they have changed.
         /// </summary>
-        /// 
+        /// <remarks>
         /// 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="grp"></param>
         /// <param name="itemID"></param>
@@ -524,15 +699,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             {
                 if (!grp.HasGroupChanged)
                 {
-                    m_log.WarnFormat("[ATTACHMENTS MODULE]: Save request for {0} which is unchanged", grp.UUID);
+                    m_log.DebugFormat(
+                        "[ATTACHMENTS MODULE]: Don't need to update asset for unchanged attachment {0}, attachpoint {1}",
+                        grp.UUID, grp.AttachmentPoint);
+
                     return;
                 }
 
                 m_log.DebugFormat(
                     "[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}",
-                    grp.UUID, grp.GetAttachmentPoint());
+                    grp.UUID, grp.AttachmentPoint);
 
                 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp);
+
                 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
                 item = m_scene.InventoryService.GetItem(item);
 
@@ -564,20 +743,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// <summary>
         /// Attach this scene object to the given avatar.
         /// </summary>
-        /// 
+        /// <remarks>
         /// This isn't publicly available since attachments should always perform the corresponding inventory 
         /// operation (to show the attach in user inventory and update the asset with positional information).
-        /// 
+        /// </remarks>
         /// <param name="sp"></param>
         /// <param name="so"></param>
         /// <param name="attachmentpoint"></param>
         /// <param name="attachOffset"></param>
         /// <param name="silent"></param>
-        protected void AttachToAgent(ScenePresence avatar, SceneObjectGroup so, uint attachmentpoint, Vector3 attachOffset, bool silent)
+        private void AttachToAgent(
+            IScenePresence avatar, 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}", 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();
 
@@ -585,12 +764,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             m_scene.DeleteFromStorage(so.UUID);
             m_scene.EventManager.TriggerParcelPrimCountTainted();
 
-            so.RootPart.AttachedAvatar = avatar.UUID;
-
-            //Anakin Lohner bug #3839 
-            SceneObjectPart[] parts = so.Parts;
-            for (int i = 0; i < parts.Length; i++)
-                parts[i].AttachedAvatar = avatar.UUID;
+            so.AttachedAvatar = avatar.UUID;
 
             if (so.RootPart.PhysActor != null)
             {
@@ -600,10 +774,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             so.AbsolutePosition = attachOffset;
             so.RootPart.AttachedPos = attachOffset;
-            so.RootPart.IsAttachment = true;
-
+            so.IsAttachment = true;
             so.RootPart.SetParentLocalId(avatar.LocalId);
-            so.SetAttachmentPoint(Convert.ToByte(attachmentpoint));
+            so.AttachmentPoint = attachmentpoint;
 
             avatar.AddAttachment(so);
 
@@ -617,5 +790,97 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             // it get cleaned up
             so.RootPart.RemFlag(PrimFlags.TemporaryOnRez);
         }
+
+        /// <summary>
+        /// Add a scene object that was previously free in the scene as an attachment to an avatar.
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        /// <param name="grp"></param>
+        /// <returns>The user inventory item created that holds the attachment.</returns>
+        private InventoryItemBase AddSceneObjectAsAttachment(IClientAPI remoteClient, SceneObjectGroup grp)
+        {
+//            m_log.DebugFormat("[SCENE]: Called AddSceneObjectAsAttachment for object {0} {1} for {2} {3} {4}", grp.Name, grp.LocalId, remoteClient.Name, remoteClient.AgentId, AgentId);
+
+            Vector3 inventoryStoredPosition = new Vector3
+                   (((grp.AbsolutePosition.X > (int)Constants.RegionSize)
+                         ? Constants.RegionSize - 6
+                         : grp.AbsolutePosition.X)
+                    ,
+                    (grp.AbsolutePosition.Y > (int)Constants.RegionSize)
+                        ? Constants.RegionSize - 6
+                        : grp.AbsolutePosition.Y,
+                    grp.AbsolutePosition.Z);
+
+            Vector3 originalPosition = grp.AbsolutePosition;
+
+            grp.AbsolutePosition = inventoryStoredPosition;
+
+            // If we're being called from a script, then trying to serialize that same script's state will not complete
+            // in any reasonable time period.  Therefore, we'll avoid it.  The worst that can happen is that if
+            // the client/server crashes rather than logging out normally, the attachment's scripts will resume
+            // without state on relog.  Arguably, this is what we want anyway.
+            string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp, false);
+
+            grp.AbsolutePosition = originalPosition;
+
+            AssetBase asset = m_scene.CreateAsset(
+                grp.GetPartName(grp.LocalId),
+                grp.GetPartDescription(grp.LocalId),
+                (sbyte)AssetType.Object,
+                Utils.StringToBytes(sceneObjectXml),
+                remoteClient.AgentId);
+
+            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.ID = UUID.Random();
+            item.AssetID = asset.FullID;
+            item.Description = asset.Description;
+            item.Name = asset.Name;
+            item.AssetType = asset.Type;
+            item.InvType = (int)InventoryType.Object;
+
+            InventoryFolderBase folder = m_scene.InventoryService.GetFolderForType(remoteClient.AgentId, 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())
+            {
+                item.BasePermissions = grp.RootPart.NextOwnerMask;
+                item.CurrentPermissions = grp.RootPart.NextOwnerMask;
+                item.NextPermissions = grp.RootPart.NextOwnerMask;
+                item.EveryOnePermissions = grp.RootPart.EveryoneMask & grp.RootPart.NextOwnerMask;
+                item.GroupPermissions = grp.RootPart.GroupMask & grp.RootPart.NextOwnerMask;
+            }
+            else
+            {
+                item.BasePermissions = grp.RootPart.BaseMask;
+                item.CurrentPermissions = grp.RootPart.OwnerMask;
+                item.NextPermissions = grp.RootPart.NextOwnerMask;
+                item.EveryOnePermissions = grp.RootPart.EveryoneMask;
+                item.GroupPermissions = grp.RootPart.GroupMask;
+            }
+            item.CreationDate = Util.UnixTimeSinceEpoch();
+
+            // sets itemID so client can show item as 'attached' in inventory
+            grp.SetFromItemID(item.ID);
+
+            if (m_scene.AddInventoryItem(item))
+            {
+                remoteClient.SendInventoryItemCreateUpdate(item, 0);
+            }
+            else
+            {
+                if (m_dialogModule != null)
+                    m_dialogModule.SendAlertToUser(remoteClient, "Operation failed");
+            }
+
+            return item;
+        }
     }
 }