Merge commit 'a6fa15e8b65a123d79a1bea8cccb459f76139314' into bigmerge

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
         /// One can tweak this number to experiment.  One current effect of reducing it is to make avatar animations
         /// occur too quickly (viewer 1) or with even more slide (viewer 2).
         /// </remarks>
-        protected float m_minFrameTimespan = 0.089f;
+        public float MinFrameTime { get; private set; }
 
         /// <summary>
         /// The time of the last frame update.
@@ -552,6 +552,7 @@ namespace OpenSim.Region.Framework.Scenes
                      bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
         {
             m_config = config;
+            MinFrameTime = 0.089f;
 
             Random random = new Random();
             
@@ -1293,7 +1294,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (Frame % m_update_physics == 0)
                 {
                     if (m_physics_enabled)
-                        physicsFPS = m_sceneGraph.UpdatePhysics(Math.Max(SinceLastFrame.TotalSeconds, m_minFrameTimespan));
+                        physicsFPS = m_sceneGraph.UpdatePhysics(Math.Max(SinceLastFrame.TotalSeconds, MinFrameTime));
                     if (SynchronizeScene != null)
                         SynchronizeScene(this);
                 }
@@ -1421,7 +1422,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             maintc = Util.EnvironmentTickCountSubtract(maintc);
-            maintc = (int)(m_minFrameTimespan * 1000) - maintc;
+            maintc = (int)(MinFrameTime * 1000) - maintc;
 
 
             m_lastUpdate = Util.EnvironmentTickCount();