diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.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(); |