ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix recent minor regression where the default frame time wasn't being set if there was no startup config section.

Browse Source 
Caused some regression tests to fail.
This commit is contained in:
Justin Clark-Casey (justincc)
2014-09-26 21:22:41 +01:00
parent 8d72145112
commit 7d30bb13be
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -802,6 +802,7 @@ namespace OpenSim.Region.Framework.Scenes
: this(regInfo, physicsScene)
{
m_config = config;
MinFrameTicks = 89;
MinMaintenanceTime = 1;
SeeIntoRegion = true;
@@ -1026,8 +1027,6 @@ namespace OpenSim.Region.Framework.Scenes
if (startupConfig.Contains("MinFrameTime"))
MinFrameTicks = (int)(startupConfig.GetFloat("MinFrameTime") * 1000);
else
MinFrameTicks = 89;
m_update_backup = startupConfig.GetInt( "UpdateStorageEveryNFrames", m_update_backup);
m_update_coarse_locations = startupConfig.GetInt( "UpdateCoarseLocationsEveryNFrames", m_update_coarse_locations);

2
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
View File

@@ -300,7 +300,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
public void TestMove()
{
TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure();
// TestHelpers.EnableLogging();
SetUpScene();