diff options
author | Justin Clark-Casey (justincc) | 2014-09-26 21:22:41 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-11-25 23:18:38 +0000 |
commit | 7d30bb13bedf1cb06fb2165e033fbbfb38424869 (patch) | |
tree | ad1f339a66feeadab51ba5e471d039fbf450df12 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | If Bullet is running on its own thread, use a reset event to control timing r... (diff) | |
download | opensim-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.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 3 |
1 files changed, 1 insertions, 2 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); |