diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 6f46a92..f0364db 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -657,6 +657,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
657 | } | 657 | } |
658 | } | 658 | } |
659 | 659 | ||
660 | if(!m_scene.IsRunning) | ||
661 | return sog; | ||
662 | |||
660 | if (root.KeyframeMotion != null) | 663 | if (root.KeyframeMotion != null) |
661 | root.KeyframeMotion.StartCrossingCheck(); | 664 | root.KeyframeMotion.StartCrossingCheck(); |
662 | 665 | ||
@@ -3018,12 +3021,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
3018 | 3021 | ||
3019 | // If we somehow got here to updating the SOG and its root part is not scheduled for update, | 3022 | // If we somehow got here to updating the SOG and its root part is not scheduled for update, |
3020 | // check to see if the physical position or rotation warrant an update. | 3023 | // check to see if the physical position or rotation warrant an update. |
3024 | /* | ||
3021 | if (m_rootPart.UpdateFlag == UpdateRequired.NONE) | 3025 | if (m_rootPart.UpdateFlag == UpdateRequired.NONE) |
3022 | { | 3026 | { |
3023 | // rootpart SendScheduledUpdates will check if a update is needed | 3027 | // rootpart SendScheduledUpdates will check if a update is needed |
3024 | m_rootPart.UpdateFlag = UpdateRequired.TERSE; | 3028 | m_rootPart.UpdateFlag = UpdateRequired.TERSE; |
3025 | } | 3029 | } |
3026 | 3030 | */ | |
3027 | if (IsAttachment) | 3031 | if (IsAttachment) |
3028 | { | 3032 | { |
3029 | ScenePresence sp = m_scene.GetScenePresence(AttachedAvatar); | 3033 | ScenePresence sp = m_scene.GetScenePresence(AttachedAvatar); |