diff options
author | Melanie | 2011-06-13 12:38:17 +0100 |
---|---|---|
committer | Melanie | 2011-06-13 12:38:17 +0100 |
commit | 9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f (patch) | |
tree | 737d2847e8ea312e18ab96df2e2f6728e068381c /OpenSim/Framework/Servers | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | match water color for warp3d map tiler and adjust lighting (diff) | |
download | opensim-SC_OLD-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.zip opensim-SC_OLD-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.tar.gz opensim-SC_OLD-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.tar.bz2 opensim-SC_OLD-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index c12d666..460f759 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -412,7 +412,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
412 | // OpenSim.Framework.WebUtil.OSHeaderRequestID | 412 | // OpenSim.Framework.WebUtil.OSHeaderRequestID |
413 | if (request.Headers["opensim-request-id"] != null) | 413 | if (request.Headers["opensim-request-id"] != null) |
414 | reqnum = String.Format("{0}:{1}",request.RemoteIPEndPoint,request.Headers["opensim-request-id"]); | 414 | reqnum = String.Format("{0}:{1}",request.RemoteIPEndPoint,request.Headers["opensim-request-id"]); |
415 | // m_log.DebugFormat("[BASE HTTP SERVER]: <{0}> handle request for {1}",reqnum,request.RawUrl); | 415 | //m_log.DebugFormat("[BASE HTTP SERVER]: <{0}> handle request for {1}",reqnum,request.RawUrl); |
416 | 416 | ||
417 | Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true); | 417 | Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true); |
418 | 418 | ||
@@ -440,7 +440,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
440 | string path = request.RawUrl; | 440 | string path = request.RawUrl; |
441 | string handlerKey = GetHandlerKey(request.HttpMethod, path); | 441 | string handlerKey = GetHandlerKey(request.HttpMethod, path); |
442 | 442 | ||
443 | // m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); | 443 | //m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); |
444 | 444 | ||
445 | if (TryGetStreamHandler(handlerKey, out requestHandler)) | 445 | if (TryGetStreamHandler(handlerKey, out requestHandler)) |
446 | { | 446 | { |