diff options
| author | Diva Canto | 2013-08-05 14:21:39 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-08-05 14:21:39 -0700 |
| commit | 2d3ac2b1ec321d7d6418d548872dcecdbc3cb14c (patch) | |
| tree | ca9a354c5a10d40679101e20ffce27afe6d257ea /OpenSim/Framework/Monitoring/Watchdog.cs | |
| parent | Child agent updates: remove the dependency on the root agent's camera positio... (diff) | |
| parent | Comment out debug log lines about script modules comms for now. (diff) | |
| download | opensim-SC-2d3ac2b1ec321d7d6418d548872dcecdbc3cb14c.zip opensim-SC-2d3ac2b1ec321d7d6418d548872dcecdbc3cb14c.tar.gz opensim-SC-2d3ac2b1ec321d7d6418d548872dcecdbc3cb14c.tar.bz2 opensim-SC-2d3ac2b1ec321d7d6418d548872dcecdbc3cb14c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Monitoring/Watchdog.cs')
| -rw-r--r-- | OpenSim/Framework/Monitoring/Watchdog.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/Monitoring/Watchdog.cs b/OpenSim/Framework/Monitoring/Watchdog.cs index 3f992b1..45762a6 100644 --- a/OpenSim/Framework/Monitoring/Watchdog.cs +++ b/OpenSim/Framework/Monitoring/Watchdog.cs | |||
| @@ -380,6 +380,7 @@ namespace OpenSim.Framework.Monitoring | |||
| 380 | if (MemoryWatchdog.Enabled) | 380 | if (MemoryWatchdog.Enabled) |
| 381 | MemoryWatchdog.Update(); | 381 | MemoryWatchdog.Update(); |
| 382 | 382 | ||
| 383 | ChecksManager.CheckChecks(); | ||
| 383 | StatsManager.RecordStats(); | 384 | StatsManager.RecordStats(); |
| 384 | 385 | ||
| 385 | m_watchdogTimer.Start(); | 386 | m_watchdogTimer.Start(); |