diff options
| author | Jonathan Freedman | 2010-10-22 18:34:50 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-22 18:34:50 -0400 |
| commit | 38e76d71ac8d60ca5228588d154b610857381a1c (patch) | |
| tree | 45a9cccf38765e8b6c41547373bdcaa91d01508f /OpenSim/Framework/Servers/HttpServer | |
| parent | Fix llParcelMediaCommandList() so that it applies commands only to the parcel... (diff) | |
| parent | * change the data exchanged within hypergrid transactions (diff) | |
| download | opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.zip opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.tar.gz opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.tar.bz2 opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.tar.xz | |
Merge branch 'hg16' into mantis5110
Diffstat (limited to '')
| -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 | { |