OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix problems with regression tests by allowing invoke of Update() with a finite number of frames even if the scene isn't active.

connector_plugin
Justin Clark-Casey (justincc) 2012-10-12 03:19:12 +01:00
parent ab7b7c5d3d
commit b9c2a1508e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -310,7 +310,8 @@ namespace OpenSim.Region.Framework.Scenes
/// Is the scene active? /// Is the scene active?
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// If false, maintenance and update loops are not run. /// If false, maintenance and update loops are not being run. Updates can still be triggered manually if
/// the scene is not active.
/// </remarks> /// </remarks>
public bool Active public bool Active
{ {
@ -1430,7 +1431,7 @@ namespace OpenSim.Region.Framework.Scenes
List<Vector3> coarseLocations; List<Vector3> coarseLocations;
List<UUID> avatarUUIDs; List<UUID> avatarUUIDs;
while (Active && !m_shuttingDown && (endRun == null || MaintenanceRun < endRun)) while (!m_shuttingDown && ((endRun == null && Active) || MaintenanceRun < endRun))
{ {
runtc = Util.EnvironmentTickCount(); runtc = Util.EnvironmentTickCount();
++MaintenanceRun; ++MaintenanceRun;
@ -1489,7 +1490,7 @@ namespace OpenSim.Region.Framework.Scenes
int previousFrameTick, tmpMS; int previousFrameTick, tmpMS;
int maintc = Util.EnvironmentTickCount(); int maintc = Util.EnvironmentTickCount();
while (Active && !m_shuttingDown && (endFrame == null || Frame < endFrame)) while (!m_shuttingDown && ((endFrame == null && Active) || Frame < endFrame))
{ {
++Frame; ++Frame;

1
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
View File

@ -65,6 +65,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
public void Init() public void Init()
{ {
m_scene = new SceneHelpers().SetupScene(); m_scene = new SceneHelpers().SetupScene();
m_scene.Start();
} }
[Test] [Test]