aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2014-07-22 15:47:42 +0100
committerUbitUmarov2014-07-22 15:47:42 +0100
commited905418b3dc0a2ec569af610024b8c4fe7a0389 (patch)
tree596879ca08f38aacfcbc70dd741d72b3b1efd2b2
parentmake ResetChildPrimPhysicsPositions only do what it is supposed to do and (diff)
downloadopensim-SC_OLD-ed905418b3dc0a2ec569af610024b8c4fe7a0389.zip
opensim-SC_OLD-ed905418b3dc0a2ec569af610024b8c4fe7a0389.tar.gz
opensim-SC_OLD-ed905418b3dc0a2ec569af610024b8c4fe7a0389.tar.bz2
opensim-SC_OLD-ed905418b3dc0a2ec569af610024b8c4fe7a0389.tar.xz
consider that CrossPrimGroupIntoNewRegion removes DIE_AT_EDGE and
RETURN_AT_EDGE from simulation
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index c7f4684..d4051c0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -554,6 +554,8 @@ namespace OpenSim.Region.Framework.Scenes
554 { 554 {
555 // this should delete the grp in this case 555 // this should delete the grp in this case
556 m_scene.CrossPrimGroupIntoNewRegion(val, this, true); 556 m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
557 // actually assume this sog was removed from simulation
558 return;
557 } 559 }
558 else 560 else
559 { 561 {