diff options
| author | Melanie | 2011-10-11 23:14:23 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-11 23:14:23 +0100 |
| commit | d1e681f68253e8a3a8f45132bb5a2d581a510fa0 (patch) | |
| tree | ac0efa90456b8b566872e9b54a22c9a882e60ab0 /OpenSim/Framework | |
| parent | Merge commit '528fcede6c31c056c3863fd19528558fcbaf475f' into bigmerge (diff) | |
| parent | Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to all... (diff) | |
| download | opensim-SC-d1e681f68253e8a3a8f45132bb5a2d581a510fa0.zip opensim-SC-d1e681f68253e8a3a8f45132bb5a2d581a510fa0.tar.gz opensim-SC-d1e681f68253e8a3a8f45132bb5a2d581a510fa0.tar.bz2 opensim-SC-d1e681f68253e8a3a8f45132bb5a2d581a510fa0.tar.xz | |
Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
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 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 | { |