aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-09-26 21:22:41 +0100
committerJustin Clark-Casey (justincc)2014-11-25 23:18:38 +0000
commit7d30bb13bedf1cb06fb2165e033fbbfb38424869 (patch)
treead1f339a66feeadab51ba5e471d039fbf450df12
parentIf Bullet is running on its own thread, use a reset event to control timing r... (diff)
downloadopensim-SC_OLD-7d30bb13bedf1cb06fb2165e033fbbfb38424869.zip
opensim-SC_OLD-7d30bb13bedf1cb06fb2165e033fbbfb38424869.tar.gz
opensim-SC_OLD-7d30bb13bedf1cb06fb2165e033fbbfb38424869.tar.bz2
opensim-SC_OLD-7d30bb13bedf1cb06fb2165e033fbbfb38424869.tar.xz
Fix recent minor regression where the default frame time wasn't being set if there was no startup config section.
Caused some regression tests to fail.
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs3
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs2
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2da254b..dc2f0bc 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -802,6 +802,7 @@ namespace OpenSim.Region.Framework.Scenes
802 : this(regInfo, physicsScene) 802 : this(regInfo, physicsScene)
803 { 803 {
804 m_config = config; 804 m_config = config;
805 MinFrameTicks = 89;
805 MinMaintenanceTime = 1; 806 MinMaintenanceTime = 1;
806 SeeIntoRegion = true; 807 SeeIntoRegion = true;
807 808
@@ -1026,8 +1027,6 @@ namespace OpenSim.Region.Framework.Scenes
1026 1027
1027 if (startupConfig.Contains("MinFrameTime")) 1028 if (startupConfig.Contains("MinFrameTime"))
1028 MinFrameTicks = (int)(startupConfig.GetFloat("MinFrameTime") * 1000); 1029 MinFrameTicks = (int)(startupConfig.GetFloat("MinFrameTime") * 1000);
1029 else
1030 MinFrameTicks = 89;
1031 1030
1032 m_update_backup = startupConfig.GetInt( "UpdateStorageEveryNFrames", m_update_backup); 1031 m_update_backup = startupConfig.GetInt( "UpdateStorageEveryNFrames", m_update_backup);
1033 m_update_coarse_locations = startupConfig.GetInt( "UpdateCoarseLocationsEveryNFrames", m_update_coarse_locations); 1032 m_update_coarse_locations = startupConfig.GetInt( "UpdateCoarseLocationsEveryNFrames", m_update_coarse_locations);
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index e82351e..0d02e27 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -300,7 +300,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
300 public void TestMove() 300 public void TestMove()
301 { 301 {
302 TestHelpers.InMethod(); 302 TestHelpers.InMethod();
303// log4net.Config.XmlConfigurator.Configure(); 303// TestHelpers.EnableLogging();
304 304
305 SetUpScene(); 305 SetUpScene();
306 306