aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
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 /OpenSim/Region/OptionalModules
parentIf Bullet is running on its own thread, use a reset event to control timing r... (diff)
downloadopensim-SC-7d30bb13bedf1cb06fb2165e033fbbfb38424869.zip
opensim-SC-7d30bb13bedf1cb06fb2165e033fbbfb38424869.tar.gz
opensim-SC-7d30bb13bedf1cb06fb2165e033fbbfb38424869.tar.bz2
opensim-SC-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.
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs2
1 files changed, 1 insertions, 1 deletions
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