aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Statistics/BaseStatsCollector.cs
diff options
context:
space:
mode:
authorCharles Krinke2009-04-17 21:48:48 +0000
committerCharles Krinke2009-04-17 21:48:48 +0000
commitb4cb45bb79619306b25c67c770165ab752aeb742 (patch)
tree3d1a7d763a3cc3647aff6a07462971c9f12b2d5c /OpenSim/Framework/Statistics/BaseStatsCollector.cs
parent* Add Implementation of Linear Motor and Linear friction from the LSL Vehicle... (diff)
downloadopensim-SC-b4cb45bb79619306b25c67c770165ab752aeb742.zip
opensim-SC-b4cb45bb79619306b25c67c770165ab752aeb742.tar.gz
opensim-SC-b4cb45bb79619306b25c67c770165ab752aeb742.tar.bz2
opensim-SC-b4cb45bb79619306b25c67c770165ab752aeb742.tar.xz
Fixes Mantis # 3469. Thank you kindly, BlueWall, for a patch that:
This patch adds extended status reporting with the url http://server:port/simstatusx/ [^] . The data is returned in json format as "text/plain" type.
Diffstat (limited to 'OpenSim/Framework/Statistics/BaseStatsCollector.cs')
-rw-r--r--OpenSim/Framework/Statistics/BaseStatsCollector.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Framework/Statistics/BaseStatsCollector.cs b/OpenSim/Framework/Statistics/BaseStatsCollector.cs
index 1e59983..a5ce8aa 100644
--- a/OpenSim/Framework/Statistics/BaseStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/BaseStatsCollector.cs
@@ -28,6 +28,10 @@
28using System; 28using System;
29using System.Text; 29using System.Text;
30 30
31using OpenMetaverse;
32using OpenMetaverse.StructuredData;
33
34
31namespace OpenSim.Framework.Statistics 35namespace OpenSim.Framework.Statistics
32{ 36{
33 /// <summary> 37 /// <summary>
@@ -47,5 +51,10 @@ namespace OpenSim.Framework.Statistics
47 51
48 return sb.ToString(); 52 return sb.ToString();
49 } 53 }
54
55 public virtual string XReport()
56 {
57 return (string) Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0).ToString() ;
58 }
50 } 59 }
51} 60}