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
                 }
             }
 
+            if(!m_scene.IsRunning)
+                return sog;
+
             if (root.KeyframeMotion != null)
                 root.KeyframeMotion.StartCrossingCheck();
 
@@ -3018,12 +3021,13 @@ namespace OpenSim.Region.Framework.Scenes
 
             // If we somehow got here to updating the SOG and its root part is not scheduled for update,
             // check to see if the physical position or rotation warrant an update.
+/*
             if (m_rootPart.UpdateFlag == UpdateRequired.NONE)
             {
                 // rootpart SendScheduledUpdates will check if a update is needed
                 m_rootPart.UpdateFlag = UpdateRequired.TERSE;
             }
-
+*/
             if (IsAttachment)
             {
                 ScenePresence sp = m_scene.GetScenePresence(AttachedAvatar);