From ed905418b3dc0a2ec569af610024b8c4fe7a0389 Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Tue, 22 Jul 2014 15:47:42 +0100
Subject: [PATCH] consider that CrossPrimGroupIntoNewRegion removes DIE_AT_EDGE
 and RETURN_AT_EDGE from simulation

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index c7f4684a4c..d4051c0d10 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -554,6 +554,8 @@ namespace OpenSim.Region.Framework.Scenes
                         {
                             // this should delete the grp in this case
                             m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
+                            // actually assume this sog was removed from simulation
+                            return;
                         }
                         else
                         {