aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-10-12 03:19:12 +0100
committerJustin Clark-Casey (justincc)2012-10-12 03:19:12 +0100
commitb9c2a1508e68b5580328097a5d5e0b5bfbc16a7d (patch)
tree5dc219f16e5e71b4c89ef1560e05f41164746208 /OpenSim/Region
parentGet Watchdog to log thread removal (diff)
downloadopensim-SC_OLD-b9c2a1508e68b5580328097a5d5e0b5bfbc16a7d.zip
opensim-SC_OLD-b9c2a1508e68b5580328097a5d5e0b5bfbc16a7d.tar.gz
opensim-SC_OLD-b9c2a1508e68b5580328097a5d5e0b5bfbc16a7d.tar.bz2
opensim-SC_OLD-b9c2a1508e68b5580328097a5d5e0b5bfbc16a7d.tar.xz
Fix problems with regression tests by allowing invoke of Update() with a finite number of frames even if the scene isn't active.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs1
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 7f4f7e5..fe549bc 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -310,7 +310,8 @@ namespace OpenSim.Region.Framework.Scenes
310 /// Is the scene active? 310 /// Is the scene active?
311 /// </summary> 311 /// </summary>
312 /// <remarks> 312 /// <remarks>
313 /// If false, maintenance and update loops are not run. 313 /// If false, maintenance and update loops are not being run. Updates can still be triggered manually if
314 /// the scene is not active.
314 /// </remarks> 315 /// </remarks>
315 public bool Active 316 public bool Active
316 { 317 {
@@ -1430,7 +1431,7 @@ namespace OpenSim.Region.Framework.Scenes
1430 List<Vector3> coarseLocations; 1431 List<Vector3> coarseLocations;
1431 List<UUID> avatarUUIDs; 1432 List<UUID> avatarUUIDs;
1432 1433
1433 while (Active && !m_shuttingDown && (endRun == null || MaintenanceRun < endRun)) 1434 while (!m_shuttingDown && ((endRun == null && Active) || MaintenanceRun < endRun))
1434 { 1435 {
1435 runtc = Util.EnvironmentTickCount(); 1436 runtc = Util.EnvironmentTickCount();
1436 ++MaintenanceRun; 1437 ++MaintenanceRun;
@@ -1489,7 +1490,7 @@ namespace OpenSim.Region.Framework.Scenes
1489 int previousFrameTick, tmpMS; 1490 int previousFrameTick, tmpMS;
1490 int maintc = Util.EnvironmentTickCount(); 1491 int maintc = Util.EnvironmentTickCount();
1491 1492
1492 while (Active && !m_shuttingDown && (endFrame == null || Frame < endFrame)) 1493 while (!m_shuttingDown && ((endFrame == null && Active) || Frame < endFrame))
1493 { 1494 {
1494 ++Frame; 1495 ++Frame;
1495 1496
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
index 1d1ff88..9a871f0 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
@@ -65,6 +65,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
65 public void Init() 65 public void Init()
66 { 66 {
67 m_scene = new SceneHelpers().SetupScene(); 67 m_scene = new SceneHelpers().SetupScene();
68 m_scene.Start();
68 } 69 }
69 70
70 [Test] 71 [Test]