From 36097a8198772d937c82e7bfc6e01a643d7785af Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 3 Oct 2008 13:45:54 +0000
Subject: Prevent attachments to be persisted in the destination region when
 the avatar is not present there.

---
 OpenSim/Region/Environment/Scenes/Scene.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')

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);
+                                }
                             }
                         }
                     }
-- 
cgit v1.1