From e3213065173e1408a138eb0bce0c9e936073b19b Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 14 Feb 2012 00:02:53 +0100
Subject: Prevent object loss and positioning outside the region with failed
 object sim crossings

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

(limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 683aafc..877fe96 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -466,6 +466,10 @@ namespace OpenSim.Region.Framework.Scenes
                         && !IsAttachmentCheckFull() && (!Scene.LoadingPrims))
                     {
                         m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
+
+                        if (IsDeleted)
+                            return;
+                        val = AbsolutePosition;
                     }
                 }
 
-- 
cgit v1.1