From 9c430208769ab7fd7877093e278e8fcae02ecef3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 20 Oct 2011 20:48:51 +0100
Subject: Get OdeScene to use passed in time step rather than hard-coded 0.089

However, I still don't recommend changing MinFrameTime from 0.089, high values do not work well and lower values don't seem to make much difference
---
 OpenSim/Region/Framework/Scenes/Scene.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2a25b2b..894d8d2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1167,7 +1167,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void StartTimer()
         {
-            //m_log.Debug("[SCENE]: Starting timer");
+//            m_log.DebugFormat("[SCENE]: Starting Heartbeat timer for {0}", RegionInfo.RegionName);
+
             //m_heartbeatTimer.Enabled = true;
             //m_heartbeatTimer.Interval = (int)(m_timespan * 1000);
             //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat);
@@ -1242,6 +1243,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             ++Frame;
 
+//            m_log.DebugFormat("[SCENE]: Processing frame {0}", Frame);
+
             try
             {
                 int tmpAgentMS = Util.EnvironmentTickCount();
@@ -1359,6 +1362,8 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (LoginsDisabled && Frame == 20)
                 {
+//                    m_log.DebugFormat("{0} {1} {2}", LoginsDisabled, m_sceneGraph.GetActiveScriptsCount(), LoginLock);
+
                     // In 99.9% of cases it is a bad idea to manually force garbage collection. However,
                     // this is a rare case where we know we have just went through a long cycle of heap
                     // allocations, and there is no more work to be done until someone logs in
@@ -1375,8 +1380,9 @@ namespace OpenSim.Region.Framework.Scenes
                             EventManager.TriggerLoginsEnabled(RegionInfo.RegionName);
                         }
                         m_log.DebugFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName);
+
                         // For RegionReady lockouts
-                        if( LoginLock == false)
+                        if(LoginLock == false)
                         {
                             LoginsDisabled = false;
                         }
-- 
cgit v1.1