diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 2 |
2 files changed, 3 insertions, 4 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 |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 40f25ae..48612ab 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -10312,7 +10312,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10312 | return handler.PacketQueue.GetStats(); | 10312 | return handler.PacketQueue.GetStats(); |
10313 | } | 10313 | } |
10314 | 10314 | ||
10315 | public string XReport() | 10315 | public string XReport(string uptime, string version) |
10316 | { | 10316 | { |
10317 | return ""; | 10317 | return ""; |
10318 | } | 10318 | } |