diff options
| author | Diva Canto | 2011-06-12 15:37:42 -0700 |
|---|---|---|
| committer | Diva Canto | 2011-06-12 15:37:42 -0700 |
| commit | fd57c91b4a10cf7ee1e94dc8fe4e81eb0d5bae3d (patch) | |
| tree | 55907fbcea5962638275453301482190c4b989b0 /OpenSim/Framework/Servers/HttpServer | |
| parent | A few more cleanups on the way to close http://opensimulator.org/mantis/view.... (diff) | |
| download | opensim-SC_OLD-fd57c91b4a10cf7ee1e94dc8fe4e81eb0d5bae3d.zip opensim-SC_OLD-fd57c91b4a10cf7ee1e94dc8fe4e81eb0d5bae3d.tar.gz opensim-SC_OLD-fd57c91b4a10cf7ee1e94dc8fe4e81eb0d5bae3d.tar.bz2 opensim-SC_OLD-fd57c91b4a10cf7ee1e94dc8fe4e81eb0d5bae3d.tar.xz | |
First pass at making the V2 map work. Standalones only for now. There are some issues with the zoom level -- TBD.
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 598e5d1..cb1117a 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -412,7 +412,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 412 | // OpenSim.Framework.WebUtil.OSHeaderRequestID | 412 | // OpenSim.Framework.WebUtil.OSHeaderRequestID |
| 413 | if (request.Headers["opensim-request-id"] != null) | 413 | if (request.Headers["opensim-request-id"] != null) |
| 414 | reqnum = String.Format("{0}:{1}",request.RemoteIPEndPoint,request.Headers["opensim-request-id"]); | 414 | reqnum = String.Format("{0}:{1}",request.RemoteIPEndPoint,request.Headers["opensim-request-id"]); |
| 415 | // m_log.DebugFormat("[BASE HTTP SERVER]: <{0}> handle request for {1}",reqnum,request.RawUrl); | 415 | //m_log.DebugFormat("[BASE HTTP SERVER]: <{0}> handle request for {1}",reqnum,request.RawUrl); |
| 416 | 416 | ||
| 417 | Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true); | 417 | Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true); |
| 418 | 418 | ||
| @@ -440,7 +440,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 440 | string path = request.RawUrl; | 440 | string path = request.RawUrl; |
| 441 | string handlerKey = GetHandlerKey(request.HttpMethod, path); | 441 | string handlerKey = GetHandlerKey(request.HttpMethod, path); |
| 442 | 442 | ||
| 443 | // m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); | 443 | //m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); |
| 444 | 444 | ||
| 445 | if (TryGetStreamHandler(handlerKey, out requestHandler)) | 445 | if (TryGetStreamHandler(handlerKey, out requestHandler)) |
| 446 | { | 446 | { |