aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 63ac5f6..8707737 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.Framework.Scenes
158 /// One can tweak this number to experiment. One current effect of reducing it is to make avatar animations 158 /// One can tweak this number to experiment. One current effect of reducing it is to make avatar animations
159 /// occur too quickly (viewer 1) or with even more slide (viewer 2). 159 /// occur too quickly (viewer 1) or with even more slide (viewer 2).
160 /// </remarks> 160 /// </remarks>
161 protected float m_minFrameTimespan = 0.089f; 161 public float MinFrameTime { get; private set; }
162 162
163 /// <summary> 163 /// <summary>
164 /// The time of the last frame update. 164 /// The time of the last frame update.
@@ -552,6 +552,7 @@ namespace OpenSim.Region.Framework.Scenes
552 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) 552 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
553 { 553 {
554 m_config = config; 554 m_config = config;
555 MinFrameTime = 0.089f;
555 556
556 Random random = new Random(); 557 Random random = new Random();
557 558
@@ -1293,7 +1294,7 @@ namespace OpenSim.Region.Framework.Scenes
1293 if (Frame % m_update_physics == 0) 1294 if (Frame % m_update_physics == 0)
1294 { 1295 {
1295 if (m_physics_enabled) 1296 if (m_physics_enabled)
1296 physicsFPS = m_sceneGraph.UpdatePhysics(Math.Max(SinceLastFrame.TotalSeconds, m_minFrameTimespan)); 1297 physicsFPS = m_sceneGraph.UpdatePhysics(Math.Max(SinceLastFrame.TotalSeconds, MinFrameTime));
1297 if (SynchronizeScene != null) 1298 if (SynchronizeScene != null)
1298 SynchronizeScene(this); 1299 SynchronizeScene(this);
1299 } 1300 }
@@ -1421,7 +1422,7 @@ namespace OpenSim.Region.Framework.Scenes
1421 } 1422 }
1422 1423
1423 maintc = Util.EnvironmentTickCountSubtract(maintc); 1424 maintc = Util.EnvironmentTickCountSubtract(maintc);
1424 maintc = (int)(m_minFrameTimespan * 1000) - maintc; 1425 maintc = (int)(MinFrameTime * 1000) - maintc;
1425 1426
1426 1427
1427 m_lastUpdate = Util.EnvironmentTickCount(); 1428 m_lastUpdate = Util.EnvironmentTickCount();