aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index aed10f6..d107b7a 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -320,8 +320,13 @@ namespace OpenSim
320 m_httpServerPort = m_networkServersInfo.HttpListenerPort; 320 m_httpServerPort = m_networkServersInfo.HttpListenerPort;
321 SceneManager.OnRestartSim += handleRestartRegion; 321 SceneManager.OnRestartSim += handleRestartRegion;
322 322
323 // Only start the memory watchdog once all regions are ready 323 // Only enable the watchdogs when all regions are ready. Otherwise we get false positives when cpu is
324 SceneManager.OnRegionsReadyStatusChange += sm => MemoryWatchdog.Enabled = sm.AllRegionsReady; 324 // heavily used during initial startup.
325 //
326 // FIXME: It's also possible that region ready status should be flipped during an OAR load since this
327 // also makes heavy use of the CPU.
328 SceneManager.OnRegionsReadyStatusChange
329 += sm => { MemoryWatchdog.Enabled = sm.AllRegionsReady; Watchdog.Enabled = sm.AllRegionsReady; };
325 } 330 }
326 331
327 /// <summary> 332 /// <summary>