aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2017-08-13 06:34:52 +0100
committerUbitUmarov2017-08-13 06:34:52 +0100
commit1dbf3215b067d1f001fc2920db79342ec811c157 (patch)
treefcbf24c566d678d8fcaf88c1eaa8e7fff8d59467 /OpenSim/Region
parentchange locking on sop updates (diff)
downloadopensim-SC-1dbf3215b067d1f001fc2920db79342ec811c157.zip
opensim-SC-1dbf3215b067d1f001fc2920db79342ec811c157.tar.gz
opensim-SC-1dbf3215b067d1f001fc2920db79342ec811c157.tar.bz2
opensim-SC-1dbf3215b067d1f001fc2920db79342ec811c157.tar.xz
jenkins tests still don't set scene.IsRunning
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index f0364db..53b7ced 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -657,8 +657,8 @@ namespace OpenSim.Region.Framework.Scenes
657 } 657 }
658 } 658 }
659 659
660 if(!m_scene.IsRunning) 660// if(!m_scene.IsRunning)
661 return sog; 661// return sog;
662 662
663 if (root.KeyframeMotion != null) 663 if (root.KeyframeMotion != null)
664 root.KeyframeMotion.StartCrossingCheck(); 664 root.KeyframeMotion.StartCrossingCheck();