2 files changed, 25 insertions, 36 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 929db21..fc92fc3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -276,6 +276,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 
                 if (objatt != null)
                 {
+                    // Loading the inventory from XML will have set this, but
+                    // there is no way the object could have changed yet,
+                    // since scripts aren't running yet. So, clear it here.
+                    objatt.HasGroupChanged = false;
                     bool tainted = false;
                     if (AttachmentPt != 0 && AttachmentPt != objatt.GetAttachmentPoint())
                         tainted = true;
@@ -486,9 +490,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     {
                         m_scene.EventManager.TriggerOnAttach(group.LocalId, itemID, UUID.Zero);
                         // CM / XMREngine!!!! Needed to conclude attach event
-                        SceneObjectSerializer.ToOriginalXmlFormat(group);
+                        //SceneObjectSerializer.ToOriginalXmlFormat(group);
                         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;
+
                         UpdateKnownItem(remoteClient, group, group.GetFromItemID(), group.OwnerID);
                         m_scene.DeleteSceneObject(group, false);
                         return;
@@ -497,25 +508,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             }
         }
         
-        public void UpdateAttachmentPosition(IClientAPI client, SceneObjectGroup sog, Vector3 pos)
-        {
-            // If this is an attachment, then we need to save the modified
-            // object back into the avatar's inventory. First we save the
-            // attachment point information, then we update the relative 
-            // positioning (which caused this method to get driven in the
-            // first place. 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.
-            // Then we save the asset back into the appropriate inventory
-            // entry. Finally, we restore the object's attachment status.
-            byte attachmentPoint = sog.GetAttachmentPoint();
-            sog.UpdateGroupPosition(pos);
-            sog.RootPart.IsAttachment = false;
-            sog.AbsolutePosition = sog.RootPart.AttachedPos;
-            UpdateKnownItem(client, sog, sog.GetFromItemID(), sog.OwnerID);
-            sog.SetAttachmentPoint(attachmentPoint);
-        }
-        
         /// <summary>
         /// Update the attachment asset for the new sog details if they have changed.
         /// </summary>
@@ -531,12 +523,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         {
             if (grp != null)
             {
-                // If an item contains scripts, it's always changed.
-                // This ensures script state is saved on detach
-                foreach (SceneObjectPart p in grp.Parts)
-                    if (p.Inventory.ContainsScripts())
-                        grp.HasGroupChanged = true;
-
                 if (!grp.HasGroupChanged)
                 {
                     m_log.WarnFormat("[ATTACHMENTS MODULE]: Save request for {0} which is unchanged", grp.UUID);
@@ -548,7 +534,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     grp.UUID, grp.GetAttachmentPoint());
 
                 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp);
-
                 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
                 item = m_scene.InventoryService.GetItem(item);
 
@@ -642,7 +627,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             // In case it is later dropped again, don't let
             // it get cleaned up
             so.RootPart.RemFlag(PrimFlags.TemporaryOnRez);
-            so.HasGroupChanged = false;
         }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 0700aa5..2e3db48 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -719,15 +719,20 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         {
                             group.RootPart.Flags |= PrimFlags.Phantom;
                             group.RootPart.IsAttachment = true;
-                        }
 
-                        // If we're rezzing an attachment then don't ask
-                        // AddNewSceneObject() to update the client since
-                        // we'll be doing that later on.  Scheduling more than
-                        // one full update during the attachment
-                        // process causes some clients to fail to display the
-                        // attachment properly.
-                        m_Scene.AddNewSceneObject(group, true, false);
+                            // If we're rezzing an attachment then don't ask
+                            // AddNewSceneObject() to update the client since
+                            // we'll be doing that later on.  Scheduling more
+                            // than one full update during the attachment
+                            // process causes some clients to fail to display
+                            // the attachment properly.
+                            // Also, don't persist attachments.
+                            m_Scene.AddNewSceneObject(group, false, false);
+                        }
+                        else
+                        {
+                            m_Scene.AddNewSceneObject(group, true, false);
+                        }
 
                         // if attachment we set it's asset id so object updates
                         // can reflect that, if not, we set it's position in world.