diff options
| author | Melanie | 2011-10-12 00:10:15 +0200 |
|---|---|---|
| committer | Melanie | 2011-10-12 00:10:15 +0200 |
| commit | 1c2b5d99c9601a3d301f4bc0f53389cca831ee04 (patch) | |
| tree | 97fa9c758f429d5dee64234e442f2c83cd1b9994 /OpenSim/Framework/Servers/HttpServer | |
| parent | Merge branch 'careminster-presence-refactor' into bigmerge (diff) | |
| parent | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge (diff) | |
| download | opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.zip opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.gz opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.bz2 opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.xz | |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
| -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 c0d65ac..a6bdc2d 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -442,7 +442,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 442 | string path = request.RawUrl; | 442 | string path = request.RawUrl; |
| 443 | string handlerKey = GetHandlerKey(request.HttpMethod, path); | 443 | string handlerKey = GetHandlerKey(request.HttpMethod, path); |
| 444 | 444 | ||
| 445 | //m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); | 445 | // m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); |
| 446 | 446 | ||
| 447 | if (TryGetStreamHandler(handlerKey, out requestHandler)) | 447 | if (TryGetStreamHandler(handlerKey, out requestHandler)) |
| 448 | { | 448 | { |