diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 10 |
1 files changed, 8 insertions, 2 deletions
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 | |||
1167 | /// </summary> | 1167 | /// </summary> |
1168 | public void StartTimer() | 1168 | public void StartTimer() |
1169 | { | 1169 | { |
1170 | //m_log.Debug("[SCENE]: Starting timer"); | 1170 | // m_log.DebugFormat("[SCENE]: Starting Heartbeat timer for {0}", RegionInfo.RegionName); |
1171 | |||
1171 | //m_heartbeatTimer.Enabled = true; | 1172 | //m_heartbeatTimer.Enabled = true; |
1172 | //m_heartbeatTimer.Interval = (int)(m_timespan * 1000); | 1173 | //m_heartbeatTimer.Interval = (int)(m_timespan * 1000); |
1173 | //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat); | 1174 | //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat); |
@@ -1242,6 +1243,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1242 | 1243 | ||
1243 | ++Frame; | 1244 | ++Frame; |
1244 | 1245 | ||
1246 | // m_log.DebugFormat("[SCENE]: Processing frame {0}", Frame); | ||
1247 | |||
1245 | try | 1248 | try |
1246 | { | 1249 | { |
1247 | int tmpAgentMS = Util.EnvironmentTickCount(); | 1250 | int tmpAgentMS = Util.EnvironmentTickCount(); |
@@ -1359,6 +1362,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1359 | 1362 | ||
1360 | if (LoginsDisabled && Frame == 20) | 1363 | if (LoginsDisabled && Frame == 20) |
1361 | { | 1364 | { |
1365 | // m_log.DebugFormat("{0} {1} {2}", LoginsDisabled, m_sceneGraph.GetActiveScriptsCount(), LoginLock); | ||
1366 | |||
1362 | // In 99.9% of cases it is a bad idea to manually force garbage collection. However, | 1367 | // In 99.9% of cases it is a bad idea to manually force garbage collection. However, |
1363 | // this is a rare case where we know we have just went through a long cycle of heap | 1368 | // this is a rare case where we know we have just went through a long cycle of heap |
1364 | // allocations, and there is no more work to be done until someone logs in | 1369 | // allocations, and there is no more work to be done until someone logs in |
@@ -1375,8 +1380,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1375 | EventManager.TriggerLoginsEnabled(RegionInfo.RegionName); | 1380 | EventManager.TriggerLoginsEnabled(RegionInfo.RegionName); |
1376 | } | 1381 | } |
1377 | m_log.DebugFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName); | 1382 | m_log.DebugFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName); |
1383 | |||
1378 | // For RegionReady lockouts | 1384 | // For RegionReady lockouts |
1379 | if( LoginLock == false) | 1385 | if(LoginLock == false) |
1380 | { | 1386 | { |
1381 | LoginsDisabled = false; | 1387 | LoginsDisabled = false; |
1382 | } | 1388 | } |