From 73caa4e94abc920269c2eba8423be49192ef184b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 29 Apr 2011 08:42:51 -0700
Subject: Minor correction to yesterday's changes. Make normal prim crossing
 (no attach) work well again.

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 --
 OpenSim/Region/Framework/Scenes/ScenePresence.cs    | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index bccbe68..19a9506 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3361,8 +3361,6 @@ namespace OpenSim.Region.Framework.Scenes
         {
             SceneObjectGroup sog = Copy(false);
             sog.m_isDeleted = false;
-            sog.RootPart.IsAttachment = false;
-            sog.RootPart.GroupPosition = sog.RootPart.AttachedPos;
             return sog;
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 507fc50..fe4a7d1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3108,6 +3108,9 @@ namespace OpenSim.Region.Framework.Scenes
                     // We need to make a copy and pass that copy
                     // because of transfers withn the same sim
                     ISceneObject clone = sog.CloneForNewScene();
+                    // Attachment module assumes that GroupPosition holds the offsets...!
+                    ((SceneObjectGroup)clone).RootPart.GroupPosition = sog.RootPart.AttachedPos;
+                    ((SceneObjectGroup)clone).RootPart.IsAttachment = false;
                     cAgent.AttachmentObjects.Add(clone);
                     cAgent.AttachmentObjectStates.Add(sog.GetStateSnapshot());
                 }
-- 
cgit v1.1