From b17150c3e8db0058fd1c29cb8ef991932730d31b Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 25 Dec 2010 08:05:42 +0100
Subject: Fix the corner casse of stack overflow when logging out with
 attachments

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index fe9201b..3e3f032 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -742,11 +742,11 @@ namespace OpenSim.Region.Framework.Scenes
                     ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar);
                     if (sp != null)
                         return sp.AbsolutePosition;
-                    return m_groupPosition;
                 }
 
                 // use root prim's group position. Physics may have updated it
-                m_groupPosition = ParentGroup.RootPart.GroupPosition;
+                if (ParentGroup.RootPart != this)
+                    m_groupPosition = ParentGroup.RootPart.GroupPosition;
                 return m_groupPosition;
             }
             set
-- 
cgit v1.1