From 598316c89051e8e8d6633520da63a7d44fd80bbd Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 17 Nov 2008 05:57:58 +0000
Subject: Make object chat come from the root prim's center, rather than trying
 to make it come from a child prim position.

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

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 4148f9b..a02840c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -424,17 +424,14 @@ namespace OpenSim.Region.Environment.Scenes
                     m_groupPosition.Y = PhysActor.Position.Y;
                     m_groupPosition.Z = PhysActor.Position.Z;
                 }
+
                 if (IsAttachment)
                 {
-//                    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;
-                        }
-//                    }
+                    ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar);
+                    if (sp != null)
+                    {
+                        return sp.AbsolutePosition;
+                    }
                 }
 
                 return m_groupPosition;
-- 
cgit v1.1