diff options
author | Jeff Ames | 2009-06-10 04:28:56 +0000 |
---|---|---|
committer | Jeff Ames | 2009-06-10 04:28:56 +0000 |
commit | a23d64dec1cbf88abc3c7e84664a683dee534e4a (patch) | |
tree | 7e85403f29839775209481ba7f6ee55aac56f209 /OpenSim/Framework/Servers | |
parent | Letting the Flotsam cache be enabled even when [AssetCache] section is missin... (diff) | |
download | opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.zip opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.gz opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.bz2 opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Framework/Servers')
5 files changed, 7 insertions, 7 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 | ||
diff --git a/OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs b/OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs index 87ba0d9..35655c6 100644 --- a/OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs +++ b/OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs | |||
@@ -30,6 +30,6 @@ using OpenMetaverse.StructuredData; | |||
30 | 30 | ||
31 | namespace OpenSim.Framework.Servers.HttpServer | 31 | namespace OpenSim.Framework.Servers.HttpServer |
32 | { | 32 | { |
33 | public delegate OSD LLSDMethod( string path, OSD request, string endpoint ); | 33 | public delegate OSD LLSDMethod(string path, OSD request, string endpoint); |
34 | public delegate OSD DefaultLLSDMethod(OSD request, IPEndPoint client); | 34 | public delegate OSD DefaultLLSDMethod(OSD request, IPEndPoint client); |
35 | } | 35 | } |
diff --git a/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs b/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs index 3f17859..2fa118d 100644 --- a/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs +++ b/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs | |||
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Servers.HttpServer.Tests | |||
48 | [Test] | 48 | [Test] |
49 | public void TestConstructor() | 49 | public void TestConstructor() |
50 | { | 50 | { |
51 | new BaseRequestHandlerImpl( null, null ); | 51 | new BaseRequestHandlerImpl(null, null); |
52 | } | 52 | } |
53 | 53 | ||
54 | [Test] | 54 | [Test] |
diff --git a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs index 6a4918d..afb4a65 100644 --- a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs +++ b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Framework.Servers.Tests | |||
50 | TestHelper.InMethod(); | 50 | TestHelper.InMethod(); |
51 | 51 | ||
52 | // GetAssetStreamHandler handler = | 52 | // GetAssetStreamHandler handler = |
53 | new GetAssetStreamHandler( null ); | 53 | new GetAssetStreamHandler(null); |
54 | } | 54 | } |
55 | 55 | ||
56 | [Test] | 56 | [Test] |
diff --git a/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs b/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs index 3df56a5..49e5061 100644 --- a/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs +++ b/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Framework.Servers.Tests | |||
38 | [Test] | 38 | [Test] |
39 | public void TestVersionLength() | 39 | public void TestVersionLength() |
40 | { | 40 | { |
41 | Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.Version.Length," VersionInfo.Version string not " + VersionInfo.VERSIONINFO_VERSION_LENGTH + " chars." ); | 41 | Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.Version.Length," VersionInfo.Version string not " + VersionInfo.VERSIONINFO_VERSION_LENGTH + " chars."); |
42 | } | 42 | } |
43 | 43 | ||
44 | [Test] | 44 | [Test] |