aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs12
2 files changed, 14 insertions, 6 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)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6feb883..310e21a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2053,9 +2053,9 @@ namespace OpenSim.Region.Framework.Scenes
2053 { 2053 {
2054 if (SitTargetUnOccupied) 2054 if (SitTargetUnOccupied)
2055 { 2055 {
2056 m_log.DebugFormat( 2056// m_log.DebugFormat(
2057 "[SCENE PRESENCE]: Sitting {0} on {1} {2} because sit target is set and unoccupied", 2057// "[SCENE PRESENCE]: Sitting {0} on {1} {2} because sit target is set and unoccupied",
2058 Name, part.Name, part.LocalId); 2058// Name, part.Name, part.LocalId);
2059 2059
2060 part.SitTargetAvatar = UUID; 2060 part.SitTargetAvatar = UUID;
2061 offset = new Vector3(avSitOffSet.X, avSitOffSet.Y, avSitOffSet.Z); 2061 offset = new Vector3(avSitOffSet.X, avSitOffSet.Y, avSitOffSet.Z);
@@ -2067,9 +2067,9 @@ namespace OpenSim.Region.Framework.Scenes
2067 { 2067 {
2068 if (Util.GetDistanceTo(AbsolutePosition, pos) <= 10) 2068 if (Util.GetDistanceTo(AbsolutePosition, pos) <= 10)
2069 { 2069 {
2070 m_log.DebugFormat( 2070// m_log.DebugFormat(
2071 "[SCENE PRESENCE]: Sitting {0} on {1} {2} because sit target is unset and within 10m", 2071// "[SCENE PRESENCE]: Sitting {0} on {1} {2} because sit target is unset and within 10m",
2072 Name, part.Name, part.LocalId); 2072// Name, part.Name, part.LocalId);
2073 2073
2074 AbsolutePosition = pos + new Vector3(0.0f, 0.0f, m_sitAvatarHeight); 2074 AbsolutePosition = pos + new Vector3(0.0f, 0.0f, m_sitAvatarHeight);
2075 canSit = true; 2075 canSit = true;