Merge branch 'master' into careminster

2026-08-05 17:05:55 +08:00 · 2012-06-11 23:15:38 +01:00
parent 84377a23db bab7dab4c5
commit 76a9885ad2
3 changed files with 15 additions and 7 deletions
--- 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
                    m => m.Scene.StatsReporter.LastReportedSimStats[11],
                    m => string.Format("{0} ms", m.GetValue())));

+            m_staticMonitors.Add(
+                new GenericMonitor(
+                    m_scene,
+                    "SpareFrameTimeMonitor",
+                    "Spare Frame Time",
+                    m => m.Scene.StatsReporter.LastReportedSimStats[21],
+                    m => string.Format("{0} ms", m.GetValue())));
+
            m_alerts.Add(new DeadlockAlert(m_staticMonitors.Find(x => x is LastFrameTimeMonitor) as LastFrameTimeMonitor));

            foreach (IAlert alert in m_alerts)