Back out the attachment location patch to debug a crash

1 files changed, 5 insertions, 4 deletions

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;