aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2010-12-25 08:05:42 +0100
committerMelanie2010-12-25 08:05:42 +0100
commitb17150c3e8db0058fd1c29cb8ef991932730d31b (patch)
tree5e20ae65a51cd65efcb7bc662b4a34a2f724f4ae /OpenSim/Region/Framework/Scenes
parentFix the recent stack overflow (diff)
downloadopensim-SC-b17150c3e8db0058fd1c29cb8ef991932730d31b.zip
opensim-SC-b17150c3e8db0058fd1c29cb8ef991932730d31b.tar.gz
opensim-SC-b17150c3e8db0058fd1c29cb8ef991932730d31b.tar.bz2
opensim-SC-b17150c3e8db0058fd1c29cb8ef991932730d31b.tar.xz
Fix the corner casse of stack overflow when logging out with attachments
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
1 files changed, 2 insertions, 2 deletions
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
742 ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar); 742 ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar);
743 if (sp != null) 743 if (sp != null)
744 return sp.AbsolutePosition; 744 return sp.AbsolutePosition;
745 return m_groupPosition;
746 } 745 }
747 746
748 // use root prim's group position. Physics may have updated it 747 // use root prim's group position. Physics may have updated it
749 m_groupPosition = ParentGroup.RootPart.GroupPosition; 748 if (ParentGroup.RootPart != this)
749 m_groupPosition = ParentGroup.RootPart.GroupPosition;
750 return m_groupPosition; 750 return m_groupPosition;
751 } 751 }
752 set 752 set