1 files changed, 10 insertions, 2 deletions

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 7ab5c33..b35c791 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -488,8 +488,16 @@ namespace OpenSim.Framework.Servers
         }
 
         public string StatReport(OSHttpRequest httpRequest)
-        {
-            return m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version );
+                {
+                        // If we catch a request for "callback", wrap the response in the value for jsonp
+                        if( httpRequest.Query.ContainsKey("callback"))
+                        {
+                                return httpRequest.Query["callback"].ToString() + "(" + m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version ) + ");";
+                        } 
+                        else 
+                        {
+                return m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version ); 
+                        }
         }
            
         protected void RemovePIDFile()