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.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b9e50c5..6a11353 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1194,7 +1194,8 @@ namespace OpenSim.Region.Framework.Scenes
1194 /// </summary> 1194 /// </summary>
1195 public void StartTimer() 1195 public void StartTimer()
1196 { 1196 {
1197 //m_log.Debug("[SCENE]: Starting timer"); 1197// m_log.DebugFormat("[SCENE]: Starting Heartbeat timer for {0}", RegionInfo.RegionName);
1198
1198 //m_heartbeatTimer.Enabled = true; 1199 //m_heartbeatTimer.Enabled = true;
1199 //m_heartbeatTimer.Interval = (int)(m_timespan * 1000); 1200 //m_heartbeatTimer.Interval = (int)(m_timespan * 1000);
1200 //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat); 1201 //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat);
@@ -1268,6 +1269,8 @@ namespace OpenSim.Region.Framework.Scenes
1268 1269
1269 ++Frame; 1270 ++Frame;
1270 1271
1272// m_log.DebugFormat("[SCENE]: Processing frame {0}", Frame);
1273
1271 try 1274 try
1272 { 1275 {
1273 int tmpAgentMS = Util.EnvironmentTickCount(); 1276 int tmpAgentMS = Util.EnvironmentTickCount();
@@ -1392,6 +1395,8 @@ namespace OpenSim.Region.Framework.Scenes
1392 1395
1393 if (LoginsDisabled && Frame == 20) 1396 if (LoginsDisabled && Frame == 20)
1394 { 1397 {
1398// m_log.DebugFormat("{0} {1} {2}", LoginsDisabled, m_sceneGraph.GetActiveScriptsCount(), LoginLock);
1399
1395 // In 99.9% of cases it is a bad idea to manually force garbage collection. However, 1400 // In 99.9% of cases it is a bad idea to manually force garbage collection. However,
1396 // this is a rare case where we know we have just went through a long cycle of heap 1401 // this is a rare case where we know we have just went through a long cycle of heap
1397 // allocations, and there is no more work to be done until someone logs in 1402 // allocations, and there is no more work to be done until someone logs in
@@ -1408,8 +1413,9 @@ namespace OpenSim.Region.Framework.Scenes
1408 EventManager.TriggerLoginsEnabled(RegionInfo.RegionName); 1413 EventManager.TriggerLoginsEnabled(RegionInfo.RegionName);
1409 } 1414 }
1410 m_log.DebugFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName); 1415 m_log.DebugFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName);
1416
1411 // For RegionReady lockouts 1417 // For RegionReady lockouts
1412 if( LoginLock == false) 1418 if(LoginLock == false)
1413 { 1419 {
1414 LoginsDisabled = false; 1420 LoginsDisabled = false;
1415 } 1421 }