diff options
| author | BlueWall | 2011-04-21 19:06:54 -0400 |
|---|---|---|
| committer | BlueWall | 2011-04-21 19:06:54 -0400 |
| commit | b8e282324ecdb608bb0ce47e878728b73cf1af56 (patch) | |
| tree | 44f9f8f872731857dfc0a6370819cd5595b927c6 /OpenSim/Framework | |
| parent | some mesh config asthetics (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-b8e282324ecdb608bb0ce47e878728b73cf1af56.zip opensim-SC-b8e282324ecdb608bb0ce47e878728b73cf1af56.tar.gz opensim-SC-b8e282324ecdb608bb0ce47e878728b73cf1af56.tar.bz2 opensim-SC-b8e282324ecdb608bb0ce47e878728b73cf1af56.tar.xz | |
fix merge conflicts with OpenSimDefaults.ini
Diffstat (limited to '')
| -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 | { |