diff options
| author | Justin Clark-Casey (justincc) | 2010-10-22 23:35:07 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-10-22 23:35:07 +0100 |
| commit | 21187f459ea2ae590dda4249fa15ebf116d04fe0 (patch) | |
| tree | 48cfec3b73bdbf54f7bc22059044b92271deedc1 /OpenSim/Framework/Servers | |
| parent | Revert "* refactor refactor refactor ServerURI 4 lyfe" (diff) | |
| parent | Merge branch 'hg16' into mantis5110 (diff) | |
| download | opensim-SC_OLD-21187f459ea2ae590dda4249fa15ebf116d04fe0.zip opensim-SC_OLD-21187f459ea2ae590dda4249fa15ebf116d04fe0.tar.gz opensim-SC_OLD-21187f459ea2ae590dda4249fa15ebf116d04fe0.tar.bz2 opensim-SC_OLD-21187f459ea2ae590dda4249fa15ebf116d04fe0.tar.xz | |
Merge remote branch 'otakup0pe/mantis5110'
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 ba8c194..0c1e5e0 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 | { |