diff options
author | Dahlia Trimble | 2009-04-25 05:06:01 +0000 |
---|---|---|
committer | Dahlia Trimble | 2009-04-25 05:06:01 +0000 |
commit | 4792e6139a86f2dd93ced34582eef3599b804794 (patch) | |
tree | 6aa308eb6d29c94b882051cea5a6fc92224627db /OpenSim/Framework/Servers/BaseOpenSimServer.cs | |
parent | * More debug warning message removal in the FreeSwitchVoiceModule (diff) | |
download | opensim-SC-4792e6139a86f2dd93ced34582eef3599b804794.zip opensim-SC-4792e6139a86f2dd93ced34582eef3599b804794.tar.gz opensim-SC-4792e6139a86f2dd93ced34582eef3599b804794.tar.bz2 opensim-SC-4792e6139a86f2dd93ced34582eef3599b804794.tar.xz |
Thanks Bluewall for Mantis #3519: a patch that adds simulator uptime and version to REST/json statistics reporting
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 45b45b2..483f8b6 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -37,6 +37,7 @@ using log4net.Appender; | |||
37 | using log4net.Core; | 37 | using log4net.Core; |
38 | using log4net.Repository; | 38 | using log4net.Repository; |
39 | using OpenSim.Framework.Console; | 39 | using OpenSim.Framework.Console; |
40 | using OpenSim.Framework.Servers; | ||
40 | using OpenSim.Framework.Statistics; | 41 | using OpenSim.Framework.Statistics; |
41 | using Timer=System.Timers.Timer; | 42 | using Timer=System.Timers.Timer; |
42 | 43 | ||
@@ -458,9 +459,9 @@ namespace OpenSim.Framework.Servers | |||
458 | } | 459 | } |
459 | } | 460 | } |
460 | 461 | ||
461 | public string StatReport() | 462 | public string StatReport(OSHttpRequest httpRequest) |
462 | { | 463 | { |
463 | return m_stats.XReport(); | 464 | return m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version ); |
464 | } | 465 | } |
465 | 466 | ||
466 | protected void RemovePIDFile() | 467 | protected void RemovePIDFile() |