aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Statistics/BaseStatsCollector.cs
diff options
context:
space:
mode:
authorDahlia Trimble2009-04-25 05:06:01 +0000
committerDahlia Trimble2009-04-25 05:06:01 +0000
commit4792e6139a86f2dd93ced34582eef3599b804794 (patch)
tree6aa308eb6d29c94b882051cea5a6fc92224627db /OpenSim/Framework/Statistics/BaseStatsCollector.cs
parent* More debug warning message removal in the FreeSwitchVoiceModule (diff)
downloadopensim-SC_OLD-4792e6139a86f2dd93ced34582eef3599b804794.zip
opensim-SC_OLD-4792e6139a86f2dd93ced34582eef3599b804794.tar.gz
opensim-SC_OLD-4792e6139a86f2dd93ced34582eef3599b804794.tar.bz2
opensim-SC_OLD-4792e6139a86f2dd93ced34582eef3599b804794.tar.xz
Thanks Bluewall for Mantis #3519: a patch that adds simulator uptime and version to REST/json statistics reporting
Diffstat (limited to 'OpenSim/Framework/Statistics/BaseStatsCollector.cs')
-rw-r--r--OpenSim/Framework/Statistics/BaseStatsCollector.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Statistics/BaseStatsCollector.cs b/OpenSim/Framework/Statistics/BaseStatsCollector.cs
index ca0907d..38e2dd5 100644
--- a/OpenSim/Framework/Statistics/BaseStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/BaseStatsCollector.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Framework.Statistics
52 return sb.ToString(); 52 return sb.ToString();
53 } 53 }
54 54
55 public virtual string XReport() 55 public virtual string XReport(string uptime, string version)
56 { 56 {
57 return (string) Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0).ToString() ; 57 return (string) Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0).ToString() ;
58 } 58 }