diff options
| author | Melanie | 2010-12-25 07:25:56 +0100 |
|---|---|---|
| committer | Melanie | 2010-12-25 07:25:56 +0100 |
| commit | 0aeafc9919b9f6b78adba231a03d75db16977398 (patch) | |
| tree | 7a8d17f79398750b0edbc07eb3f9de7ba74f0c2b /OpenSim/Region | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC_OLD-0aeafc9919b9f6b78adba231a03d75db16977398.zip opensim-SC_OLD-0aeafc9919b9f6b78adba231a03d75db16977398.tar.gz opensim-SC_OLD-0aeafc9919b9f6b78adba231a03d75db16977398.tar.bz2 opensim-SC_OLD-0aeafc9919b9f6b78adba231a03d75db16977398.tar.xz | |
Fix the recent stack overflow
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
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 |