aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorUbitUmarov2015-09-04 23:07:25 +0100
committerUbitUmarov2015-09-04 23:07:25 +0100
commit2130984befaabda9b264c96e8db44594206818e3 (patch)
treeaa89bc2cac30c46725b087a1ab442f9634e09301 /OpenSim/Region/CoreModules
parentcomment a large debug message (diff)
downloadopensim-SC_OLD-2130984befaabda9b264c96e8db44594206818e3.zip
opensim-SC_OLD-2130984befaabda9b264c96e8db44594206818e3.tar.gz
opensim-SC_OLD-2130984befaabda9b264c96e8db44594206818e3.tar.bz2
opensim-SC_OLD-2130984befaabda9b264c96e8db44594206818e3.tar.xz
a few changes to stats. Array order coerent on users. give up on moses stats for now, since SimExtraStatsCollector cant reach SimStatsReport etc
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs6
2 files changed, 4 insertions, 4 deletions
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
205 m_scene, 205 m_scene,
206 "ScriptEventsPerSecondMonitor", 206 "ScriptEventsPerSecondMonitor",
207 "Script Events", 207 "Script Events",
208 m => m.Scene.StatsReporter.LastReportedSimStats[20], 208 m => m.Scene.StatsReporter.LastReportedSimStats[23],
209 m => string.Format("{0} per second", m.GetValue()))); 209 m => string.Format("{0} per second", m.GetValue())));
210 210
211 m_staticMonitors.Add( 211 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
271 float totalFrameTime = stats[8]; 271 float totalFrameTime = stats[8];
272// float netFrameTime = stats.StatsBlock[9].StatValue; // Ignored - not used by OpenSimulator 272// float netFrameTime = stats.StatsBlock[9].StatValue; // Ignored - not used by OpenSimulator
273 float physicsFrameTime = stats[10]; 273 float physicsFrameTime = stats[10];
274 float otherFrameTime = stats[11]; 274 float otherFrameTime = stats[12];
275// float imageFrameTime = stats.StatsBlock[12].StatValue; // Ignored 275// float imageFrameTime = stats.StatsBlock[11].StatValue; // Ignored
276 float inPacketsPerSecond = stats[13]; 276 float inPacketsPerSecond = stats[13];
277 float outPacketsPerSecond = stats[14]; 277 float outPacketsPerSecond = stats[14];
278 float unackedBytes = stats[15]; 278 float unackedBytes = stats[15];
@@ -280,7 +280,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
280 float pendingDownloads = stats[17]; 280 float pendingDownloads = stats[17];
281 float pendingUploads = stats[18]; 281 float pendingUploads = stats[18];
282 float activeScripts = stats[19]; 282 float activeScripts = stats[19];
283 float scriptLinesPerSecond = stats[20]; 283 float scriptLinesPerSecond = stats[23];
284 284
285 StringBuilder sb = new StringBuilder(); 285 StringBuilder sb = new StringBuilder();
286 sb.AppendFormat("Scene statistics for {0}\n", m_scene.RegionInfo.RegionName); 286 sb.AppendFormat("Scene statistics for {0}\n", m_scene.RegionInfo.RegionName);