3 files changed, 16 insertions, 4 deletions

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index d63544a..f58f334 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -517,6 +517,10 @@ namespace OpenSim.Region.Environment.Scenes
                                 group.SetFromAssetID(newAssetID);
                             }
                             group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos);
+                            // In case it is later dropped again, don't let
+                            // it get cleaned up
+                            //
+                            group.RootPart.RemFlag(PrimFlags.TemporaryOnRez);
                         }
                         else
                         {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 8f8c89e..09ebbee 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2052,6 +2052,10 @@ namespace OpenSim.Region.Environment.Scenes
                         {
                             if (RootPrim.Shape.State != 0)
                             {
+                                // Never persist
+
+                                grp.DetachFromBackup();
+
                                 // Attachment
                                 ScenePresence sp = GetScenePresence(grp.OwnerID);
                                 if (sp != null)
@@ -2063,6 +2067,10 @@ namespace OpenSim.Region.Environment.Scenes
                                     grp.SetFromAssetID(grp.RootPart.LastOwnerID);
                                     AttachObject(sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition);
                                 }
+                                else
+                                {
+                                    RootPrim.AddFlag(PrimFlags.TemporaryOnRez);
+                                }
                             }
                         }
                     }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 482d936..ebd79e2 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -713,7 +713,7 @@ namespace OpenSim.Region.Environment.Scenes
                 // don't attach attachments to child agents
                 if (avatar.IsChildAgent) return;
 
-                DetachFromBackup(this);
+                DetachFromBackup();
                 m_rootPart.AttachedAvatar = agentID;
 
 
@@ -955,7 +955,7 @@ namespace OpenSim.Region.Environment.Scenes
             // code needs a redesign.
             m_isDeleted = true;
 
-            DetachFromBackup(this);
+            DetachFromBackup();
 
             lock (m_parts)
             {
@@ -1925,9 +1925,9 @@ namespace OpenSim.Region.Environment.Scenes
         /// Stop this object from being persisted over server restarts.
         /// </summary>
         /// <param name="objectGroup"></param>
-        public void DetachFromBackup(SceneObjectGroup objectGroup)
+        public void DetachFromBackup()
         {
-            m_scene.EventManager.OnBackup -= objectGroup.ProcessBackup;
+            m_scene.EventManager.OnBackup -= ProcessBackup;
         }
 
         private void LinkNonRootPart(SceneObjectPart part, Vector3 oldGroupPosition, Quaternion oldGroupRotation)