From 2a8020b9d9e77445ebbb91128d53eb9a32db64b6 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 17 Nov 2008 05:47:36 +0000
Subject: Back out the attachment location patch to debug a crash

---
 OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index a7eb0b7..4148f9b 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -426,14 +426,15 @@ namespace OpenSim.Region.Environment.Scenes
                 }
                 if (IsAttachment)
                 {
-                    if (m_parentGroup != null && m_parentGroup.RootPart != null)
-                    {
-                        ScenePresence sp = m_parentGroup.Scene.GetScenePresence(m_parentGroup.RootPart.AttachedAvatar);
+//                    if (m_parentGroup != null && m_parentGroup.RootPart != null)
+//                    {
+//                        ScenePresence sp = m_parentGroup.Scene.GetScenePresence(m_parentGroup.RootPart.AttachedAvatar);
+                        ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar);
                         if (sp != null)
                         {
                             return sp.AbsolutePosition;
                         }
-                    }
+//                    }
                 }
 
                 return m_groupPosition;
-- 
cgit v1.1