aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/BaseOpenSimServer.cs
diff options
context:
space:
mode:
authorJeff Ames2009-06-10 04:28:56 +0000
committerJeff Ames2009-06-10 04:28:56 +0000
commita23d64dec1cbf88abc3c7e84664a683dee534e4a (patch)
tree7e85403f29839775209481ba7f6ee55aac56f209 /OpenSim/Framework/Servers/BaseOpenSimServer.cs
parentLetting the Flotsam cache be enabled even when [AssetCache] section is missin... (diff)
downloadopensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.zip
opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.gz
opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.bz2
opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/Framework/Servers/BaseOpenSimServer.cs')
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index aa09c60..d2193ca 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -490,13 +490,13 @@ namespace OpenSim.Framework.Servers
490 public string StatReport(OSHttpRequest httpRequest) 490 public string StatReport(OSHttpRequest httpRequest)
491 { 491 {
492 // If we catch a request for "callback", wrap the response in the value for jsonp 492 // If we catch a request for "callback", wrap the response in the value for jsonp
493 if ( httpRequest.Query.ContainsKey("callback")) 493 if (httpRequest.Query.ContainsKey("callback"))
494 { 494 {
495 return httpRequest.Query["callback"].ToString() + "(" + m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version ) + ");"; 495 return httpRequest.Query["callback"].ToString() + "(" + m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version) + ");";
496 } 496 }
497 else 497 else
498 { 498 {
499 return m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version ); 499 return m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version);
500 } 500 }
501 } 501 }
502 502