Fix problems with regression tests by allowing invoke of Update() with a finite number of frames even if the scene isn't active.
							parent
							
								
									caedac67e0
								
							
						
					
					
						commit
						da00b57d4b
					
				|  | @ -285,7 +285,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
|         /// Is the scene active? | ||||
|         /// </summary> | ||||
|         /// <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> | ||||
|         public bool Active | ||||
|         { | ||||
|  | @ -1386,7 +1387,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
|             List<Vector3> coarseLocations; | ||||
|             List<UUID> avatarUUIDs; | ||||
| 
 | ||||
|             while (Active && !m_shuttingDown && (endRun == null || MaintenanceRun < endRun)) | ||||
|             while (!m_shuttingDown && ((endRun == null && Active) || MaintenanceRun < endRun)) | ||||
|             { | ||||
|                 runtc = Util.EnvironmentTickCount(); | ||||
|                 ++MaintenanceRun; | ||||
|  | @ -1445,7 +1446,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
|             int previousFrameTick, tmpMS; | ||||
|             int maintc = Util.EnvironmentTickCount(); | ||||
| 
 | ||||
|             while (Active && !m_shuttingDown && (endFrame == null || Frame < endFrame)) | ||||
|             while (!m_shuttingDown && ((endFrame == null && Active) || Frame < endFrame)) | ||||
|             { | ||||
|                 ++Frame; | ||||
| 
 | ||||
|  |  | |||
|  | @ -65,6 +65,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
|         public void Init() | ||||
|         { | ||||
|             m_scene = new SceneHelpers().SetupScene(); | ||||
|             m_scene.Start(); | ||||
|         } | ||||
| 
 | ||||
|         [Test] | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Justin Clark-Casey (justincc)
						Justin Clark-Casey (justincc)