From 4792e6139a86f2dd93ced34582eef3599b804794 Mon Sep 17 00:00:00 2001
From: Dahlia Trimble
Date: Sat, 25 Apr 2009 05:06:01 +0000
Subject: Thanks Bluewall for Mantis #3519: a patch that adds simulator uptime
 and version to REST/json statistics reporting

---
 OpenSim/Region/Application/OpenSimBase.cs            | 5 ++---
 OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region')

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
         /// <summary>
         /// Handler to supply the current extended status of this sim 
         /// </summary>
-        /// Currently prints the same a "show stats" plus the uptime of the sim
+        /// Sends the statistical data in a json serialization
         public class XSimStatusHandler : IStreamedRequestHandler
         {
             OpenSimBase m_opensim;
         
             public XSimStatusHandler(OpenSimBase sim)
-            // public XSimStatusHandler(BaseOpenSimServer sim)
             {
                 m_opensim = sim;
             }
@@ -824,7 +823,7 @@ namespace OpenSim
             public byte[] Handle(string path, Stream request,
                                  OSHttpRequest httpRequest, OSHttpResponse httpResponse)
             {
-                return Encoding.UTF8.GetBytes(m_opensim.StatReport());
+                return Encoding.UTF8.GetBytes(m_opensim.StatReport(httpRequest));
             }
 
             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
             return handler.PacketQueue.GetStats();
         }
         
-        public string XReport() 
+        public string XReport(string uptime, string version) 
         {
             return  "";
         }
-- 
cgit v1.1