aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-11-08 19:00:03 +0100
committerMelanie2010-11-08 19:00:03 +0100
commit15da52d73aab37ba32447d317bab89baaceb38ba (patch)
tree8a03d9e8c3ac8f503e6a4aa61ee8e29701c45f5f /OpenSim
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-15da52d73aab37ba32447d317bab89baaceb38ba.zip
opensim-SC-15da52d73aab37ba32447d317bab89baaceb38ba.tar.gz
opensim-SC-15da52d73aab37ba32447d317bab89baaceb38ba.tar.bz2
opensim-SC-15da52d73aab37ba32447d317bab89baaceb38ba.tar.xz
Prevent temp-on-rez prims from being persisted
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 93d223e..79f7162 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1553,6 +1553,9 @@ namespace OpenSim.Region.Framework.Scenes
1553 return; 1553 return;
1554 } 1554 }
1555 1555
1556 if ((RootPart.Flags & PrimFlags.TemporaryOnRez) != 0)
1557 return;
1558
1556 // Since this is the top of the section of call stack for backing up a particular scene object, don't let 1559 // Since this is the top of the section of call stack for backing up a particular scene object, don't let
1557 // any exception propogate upwards. 1560 // any exception propogate upwards.
1558 try 1561 try