diff options
| author | Melanie | 2012-06-11 23:15:38 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-11 23:15:38 +0100 |
| commit | 76a9885ad2cc5964e85dc2d47d9ea1d6a5b57e00 (patch) | |
| tree | 85d2293d9a860ab88d58d084a6299a5977813466 /OpenSim/Region/CoreModules | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Comment out the scene presence sitting debug log messages for now (diff) | |
| download | opensim-SC_OLD-76a9885ad2cc5964e85dc2d47d9ea1d6a5b57e00.zip opensim-SC_OLD-76a9885ad2cc5964e85dc2d47d9ea1d6a5b57e00.tar.gz opensim-SC_OLD-76a9885ad2cc5964e85dc2d47d9ea1d6a5b57e00.tar.bz2 opensim-SC_OLD-76a9885ad2cc5964e85dc2d47d9ea1d6a5b57e00.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs index 4a8c369..e135c21 100644 --- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs | |||
| @@ -341,6 +341,14 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring | |||
| 341 | m => m.Scene.StatsReporter.LastReportedSimStats[11], | 341 | m => m.Scene.StatsReporter.LastReportedSimStats[11], |
| 342 | m => string.Format("{0} ms", m.GetValue()))); | 342 | m => string.Format("{0} ms", m.GetValue()))); |
| 343 | 343 | ||
| 344 | m_staticMonitors.Add( | ||
| 345 | new GenericMonitor( | ||
| 346 | m_scene, | ||
| 347 | "SpareFrameTimeMonitor", | ||
| 348 | "Spare Frame Time", | ||
| 349 | m => m.Scene.StatsReporter.LastReportedSimStats[21], | ||
| 350 | m => string.Format("{0} ms", m.GetValue()))); | ||
| 351 | |||
| 344 | m_alerts.Add(new DeadlockAlert(m_staticMonitors.Find(x => x is LastFrameTimeMonitor) as LastFrameTimeMonitor)); | 352 | m_alerts.Add(new DeadlockAlert(m_staticMonitors.Find(x => x is LastFrameTimeMonitor) as LastFrameTimeMonitor)); |
| 345 | 353 | ||
| 346 | foreach (IAlert alert in m_alerts) | 354 | foreach (IAlert alert in m_alerts) |