aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2010-12-25 07:25:56 +0100
committerMelanie2010-12-25 07:25:56 +0100
commit0aeafc9919b9f6b78adba231a03d75db16977398 (patch)
tree7a8d17f79398750b0edbc07eb3f9de7ba74f0c2b /OpenSim/Region/Framework/Scenes
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-0aeafc9919b9f6b78adba231a03d75db16977398.zip
opensim-SC-0aeafc9919b9f6b78adba231a03d75db16977398.tar.gz
opensim-SC-0aeafc9919b9f6b78adba231a03d75db16977398.tar.bz2
opensim-SC-0aeafc9919b9f6b78adba231a03d75db16977398.tar.xz
Fix the recent stack overflow
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index faa6f37..fe9201b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -734,6 +734,7 @@ namespace OpenSim.Region.Framework.Scenes
734 { 734 {
735 if (actor != null) 735 if (actor != null)
736 m_groupPosition = actor.Position; 736 m_groupPosition = actor.Position;
737 return m_groupPosition;
737 } 738 }
738 739
739 if (IsAttachment) 740 if (IsAttachment)
@@ -741,6 +742,7 @@ namespace OpenSim.Region.Framework.Scenes
741 ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar); 742 ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar);
742 if (sp != null) 743 if (sp != null)
743 return sp.AbsolutePosition; 744 return sp.AbsolutePosition;
745 return m_groupPosition;
744 } 746 }
745 747
746 // use root prim's group position. Physics may have updated it 748 // use root prim's group position. Physics may have updated it