diff options
author | Jeff Ames | 2009-05-20 01:32:06 +0000 |
---|---|---|
committer | Jeff Ames | 2009-05-20 01:32:06 +0000 |
commit | e0bc5c5db2b88691c04b06be2fa73a75746126cb (patch) | |
tree | fa33ed724c57578d7ed76044f68940a4e09a8026 /OpenSim/Framework/Servers/BaseOpenSimServer.cs | |
parent | Update svn properties. (diff) | |
download | opensim-SC_OLD-e0bc5c5db2b88691c04b06be2fa73a75746126cb.zip opensim-SC_OLD-e0bc5c5db2b88691c04b06be2fa73a75746126cb.tar.gz opensim-SC_OLD-e0bc5c5db2b88691c04b06be2fa73a75746126cb.tar.bz2 opensim-SC_OLD-e0bc5c5db2b88691c04b06be2fa73a75746126cb.tar.xz |
Add copyright headers, formatting cleanup.
Diffstat (limited to 'OpenSim/Framework/Servers/BaseOpenSimServer.cs')
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index b35c791..d8a22b1 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -488,16 +488,16 @@ namespace OpenSim.Framework.Servers | |||
488 | } | 488 | } |
489 | 489 | ||
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 | ||
503 | protected void RemovePIDFile() | 503 | protected void RemovePIDFile() |