aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
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/Region/Application
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/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index b28e880..286c5a1 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -810,13 +810,12 @@ namespace OpenSim
810 /// <summary> 810 /// <summary>
811 /// Handler to supply the current extended status of this sim 811 /// Handler to supply the current extended status of this sim
812 /// </summary> 812 /// </summary>
813 /// Currently prints the same a "show stats" plus the uptime of the sim 813 /// Sends the statistical data in a json serialization
814 public class XSimStatusHandler : IStreamedRequestHandler 814 public class XSimStatusHandler : IStreamedRequestHandler
815 { 815 {
816 OpenSimBase m_opensim; 816 OpenSimBase m_opensim;
817 817
818 public XSimStatusHandler(OpenSimBase sim) 818 public XSimStatusHandler(OpenSimBase sim)
819 // public XSimStatusHandler(BaseOpenSimServer sim)
820 { 819 {
821 m_opensim = sim; 820 m_opensim = sim;
822 } 821 }
@@ -824,7 +823,7 @@ namespace OpenSim
824 public byte[] Handle(string path, Stream request, 823 public byte[] Handle(string path, Stream request,
825 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 824 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
826 { 825 {
827 return Encoding.UTF8.GetBytes(m_opensim.StatReport()); 826 return Encoding.UTF8.GetBytes(m_opensim.StatReport(httpRequest));
828 } 827 }
829 828
830 public string ContentType 829 public string ContentType