diff options
| author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
| commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
| tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Framework/Monitoring/Watchdog.cs | |
| parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
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 69d2db5..32724ec 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(); |