diff options
author | Justin Clark-Casey (justincc) | 2010-10-22 23:52:07 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-22 23:52:07 +0100 |
commit | fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075 (patch) | |
tree | e1af6e01bd9be556fe652a32e4ec93c31c80a283 /OpenSim/Framework/Servers/HttpServer | |
parent | Merge remote branch 'otakup0pe/mantis5110' (diff) | |
download | opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.zip opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.gz opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.bz2 opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.xz |
Revert "Merge remote branch 'otakup0pe/mantis5110'"
This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing
changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
-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 0c1e5e0..ba8c194 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -348,7 +348,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
348 | { | 348 | { |
349 | try | 349 | try |
350 | { | 350 | { |
351 | //m_log.Debug("[BASE HTTP SERVER]: Handling request to " + request.RawUrl); | 351 | // m_log.Debug("[BASE HTTP SERVER]: Handling request to " + request.RawUrl); |
352 | 352 | ||
353 | Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true); | 353 | Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true); |
354 | 354 | ||
@@ -376,7 +376,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
376 | string path = request.RawUrl; | 376 | string path = request.RawUrl; |
377 | string handlerKey = GetHandlerKey(request.HttpMethod, path); | 377 | string handlerKey = GetHandlerKey(request.HttpMethod, path); |
378 | 378 | ||
379 | //m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); | 379 | // m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); |
380 | 380 | ||
381 | if (TryGetStreamHandler(handlerKey, out requestHandler)) | 381 | if (TryGetStreamHandler(handlerKey, out requestHandler)) |
382 | { | 382 | { |