aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-03 13:45:54 +0000
committerMelanie Thielker2008-10-03 13:45:54 +0000
commit36097a8198772d937c82e7bfc6e01a643d7785af (patch)
treede4a6b516edf12ef24edee02bbd228c1be5d19fd /OpenSim/Region/Environment/Scenes/Scene.cs
parentfix the sqlite break. There were two issue here: (diff)
downloadopensim-SC_OLD-36097a8198772d937c82e7bfc6e01a643d7785af.zip
opensim-SC_OLD-36097a8198772d937c82e7bfc6e01a643d7785af.tar.gz
opensim-SC_OLD-36097a8198772d937c82e7bfc6e01a643d7785af.tar.bz2
opensim-SC_OLD-36097a8198772d937c82e7bfc6e01a643d7785af.tar.xz
Prevent attachments to be persisted in the destination region when the
avatar is not present there.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs8
1 files changed, 8 insertions, 0 deletions
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
2052 { 2052 {
2053 if (RootPrim.Shape.State != 0) 2053 if (RootPrim.Shape.State != 0)
2054 { 2054 {
2055 // Never persist
2056
2057 grp.DetachFromBackup();
2058
2055 // Attachment 2059 // Attachment
2056 ScenePresence sp = GetScenePresence(grp.OwnerID); 2060 ScenePresence sp = GetScenePresence(grp.OwnerID);
2057 if (sp != null) 2061 if (sp != null)
@@ -2063,6 +2067,10 @@ namespace OpenSim.Region.Environment.Scenes
2063 grp.SetFromAssetID(grp.RootPart.LastOwnerID); 2067 grp.SetFromAssetID(grp.RootPart.LastOwnerID);
2064 AttachObject(sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition); 2068 AttachObject(sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition);
2065 } 2069 }
2070 else
2071 {
2072 RootPrim.AddFlag(PrimFlags.TemporaryOnRez);
2073 }
2066 } 2074 }
2067 } 2075 }
2068 } 2076 }