From 2130984befaabda9b264c96e8db44594206818e3 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 4 Sep 2015 23:07:25 +0100 Subject: a few changes to stats. Array order coerent on users. give up on moses stats for now, since SimExtraStatsCollector cant reach SimStatsReport etc --- OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs | 2 +- OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs index 64feec1..f1d4756 100644 --- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs @@ -205,7 +205,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring m_scene, "ScriptEventsPerSecondMonitor", "Script Events", - m => m.Scene.StatsReporter.LastReportedSimStats[20], + m => m.Scene.StatsReporter.LastReportedSimStats[23], m => string.Format("{0} per second", m.GetValue()))); m_staticMonitors.Add( diff --git a/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs b/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs index 710c8da..8d192ba 100644 --- a/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs +++ b/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs @@ -271,8 +271,8 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands float totalFrameTime = stats[8]; // float netFrameTime = stats.StatsBlock[9].StatValue; // Ignored - not used by OpenSimulator float physicsFrameTime = stats[10]; - float otherFrameTime = stats[11]; -// float imageFrameTime = stats.StatsBlock[12].StatValue; // Ignored + float otherFrameTime = stats[12]; +// float imageFrameTime = stats.StatsBlock[11].StatValue; // Ignored float inPacketsPerSecond = stats[13]; float outPacketsPerSecond = stats[14]; float unackedBytes = stats[15]; @@ -280,7 +280,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands float pendingDownloads = stats[17]; float pendingUploads = stats[18]; float activeScripts = stats[19]; - float scriptLinesPerSecond = stats[20]; + float scriptLinesPerSecond = stats[23]; StringBuilder sb = new StringBuilder(); sb.AppendFormat("Scene statistics for {0}\n", m_scene.RegionInfo.RegionName); -- cgit v1.1