From b4be9baa4a8b10c99b9c9e471607b782c8c75851 Mon Sep 17 00:00:00 2001
From: diva
Date: Tue, 10 Feb 2009 22:54:05 +0000
Subject: Fixes the problem of attachment offset after crossings/TPs. Hopefully
 it fixes mantis #3126, as well as other random displacements. The problem was
 that the new object at the receiving region was being marked as attachment
 before AttachObject was called. That made its AbsolutePosition be the
 position of the avie, and that was what was being given to AttachObject.

---
 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 520b228..997cce5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1717,6 +1717,9 @@ namespace OpenSim.Region.Framework.Scenes
             if (m_rootPart == null)
                 return;
 
+            if ((RootPart.Flags & PrimFlags.TemporaryOnRez) != 0)
+                return;
+
             lock (m_parts)
             {
                 bool UsePhysics = ((RootPart.Flags & PrimFlags.Physics) != 0);
@@ -3036,6 +3039,7 @@ namespace OpenSim.Region.Framework.Scenes
         public virtual ISceneObject CloneForNewScene()
         {
             SceneObjectGroup sog = Copy(this.OwnerID, this.GroupID, false);
+            sog.m_isDeleted = false;
             return sog;
         }
 
-- 
cgit v1.1