diff options
| author | Melanie | 2010-08-06 18:08:40 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-06 18:08:40 +0100 |
| commit | 26387252f5adbf71dc77084ff2d1b463fad5038c (patch) | |
| tree | 0453fd501165368affa2917180ef3e43c5555ea0 /OpenSim/Framework/Servers | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | Fix a parenthesis in prior commit (diff) | |
| download | opensim-SC_OLD-26387252f5adbf71dc77084ff2d1b463fad5038c.zip opensim-SC_OLD-26387252f5adbf71dc77084ff2d1b463fad5038c.tar.gz opensim-SC_OLD-26387252f5adbf71dc77084ff2d1b463fad5038c.tar.bz2 opensim-SC_OLD-26387252f5adbf71dc77084ff2d1b463fad5038c.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Servers')
| -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 8123f2f..ffa30d5 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -362,7 +362,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 362 | string path = request.RawUrl; | 362 | string path = request.RawUrl; |
| 363 | string handlerKey = GetHandlerKey(request.HttpMethod, path); | 363 | string handlerKey = GetHandlerKey(request.HttpMethod, path); |
| 364 | 364 | ||
| 365 | //m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); | 365 | // m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); |
| 366 | 366 | ||
| 367 | if (TryGetStreamHandler(handlerKey, out requestHandler)) | 367 | if (TryGetStreamHandler(handlerKey, out requestHandler)) |
| 368 | { | 368 | { |