diff options
| author | Melanie | 2011-04-21 16:28:29 +0100 |
|---|---|---|
| committer | Melanie | 2011-04-21 16:28:29 +0100 |
| commit | 09b6d717bf7c43b3dc60aba27c1ac085da26e36d (patch) | |
| tree | 9346746bd392b679a35fbc969c1e46d9c9862745 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | fix meshing failure on sculpt maps smaller than 64x64 (diff) | |
| download | opensim-SC-09b6d717bf7c43b3dc60aba27c1ac085da26e36d.zip opensim-SC-09b6d717bf7c43b3dc60aba27c1ac085da26e36d.tar.gz opensim-SC-09b6d717bf7c43b3dc60aba27c1ac085da26e36d.tar.bz2 opensim-SC-09b6d717bf7c43b3dc60aba27c1ac085da26e36d.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index ccec9b7..ba89e21 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -430,7 +430,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 430 | string path = request.RawUrl; | 430 | string path = request.RawUrl; |
| 431 | string handlerKey = GetHandlerKey(request.HttpMethod, path); | 431 | string handlerKey = GetHandlerKey(request.HttpMethod, path); |
| 432 | 432 | ||
| 433 | //m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); | 433 | // m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); |
| 434 | 434 | ||
| 435 | if (TryGetStreamHandler(handlerKey, out requestHandler)) | 435 | if (TryGetStreamHandler(handlerKey, out requestHandler)) |
| 436 | { | 436 | { |