diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 2c24c0f..e0b76f6 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -155,7 +155,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
155 | /// One can tweak this number to experiment. One current effect of reducing it is to make avatar animations | 155 | /// One can tweak this number to experiment. One current effect of reducing it is to make avatar animations |
156 | /// occur too quickly (viewer 1) or with even more slide (viewer 2). | 156 | /// occur too quickly (viewer 1) or with even more slide (viewer 2). |
157 | /// </remarks> | 157 | /// </remarks> |
158 | protected float m_minFrameTimespan = 0.089f; | 158 | public float MinFrameTime { get; private set; } |
159 | 159 | ||
160 | /// <summary> | 160 | /// <summary> |
161 | /// The time of the last frame update. | 161 | /// The time of the last frame update. |
@@ -533,6 +533,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
533 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) | 533 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) |
534 | { | 534 | { |
535 | m_config = config; | 535 | m_config = config; |
536 | MinFrameTime = 0.089f; | ||
536 | 537 | ||
537 | Random random = new Random(); | 538 | Random random = new Random(); |
538 | 539 | ||
@@ -1268,7 +1269,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1268 | if (Frame % m_update_physics == 0) | 1269 | if (Frame % m_update_physics == 0) |
1269 | { | 1270 | { |
1270 | if (m_physics_enabled) | 1271 | if (m_physics_enabled) |
1271 | physicsFPS = m_sceneGraph.UpdatePhysics(Math.Max(SinceLastFrame.TotalSeconds, m_minFrameTimespan)); | 1272 | physicsFPS = m_sceneGraph.UpdatePhysics(Math.Max(SinceLastFrame.TotalSeconds, MinFrameTime)); |
1272 | if (SynchronizeScene != null) | 1273 | if (SynchronizeScene != null) |
1273 | SynchronizeScene(this); | 1274 | SynchronizeScene(this); |
1274 | } | 1275 | } |
@@ -1389,7 +1390,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1389 | } | 1390 | } |
1390 | 1391 | ||
1391 | maintc = Util.EnvironmentTickCountSubtract(maintc); | 1392 | maintc = Util.EnvironmentTickCountSubtract(maintc); |
1392 | maintc = (int)(m_minFrameTimespan * 1000) - maintc; | 1393 | maintc = (int)(MinFrameTime * 1000) - maintc; |
1393 | 1394 | ||
1394 | if (maintc > 0) | 1395 | if (maintc > 0) |
1395 | Thread.Sleep(maintc); | 1396 | Thread.Sleep(maintc); |