diff options
author | Melanie | 2010-09-03 03:37:18 +0100 |
---|---|---|
committer | Melanie | 2010-09-03 03:37:18 +0100 |
commit | 4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00 (patch) | |
tree | 6ecae46c7c5d46d4eb5a5ed65c1a7a8b8b15cc04 /OpenSim/Framework | |
parent | Fix an issue with rezzing scripted objects. (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00.zip opensim-SC_OLD-4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00.tar.gz opensim-SC_OLD-4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00.tar.bz2 opensim-SC_OLD-4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 016ab73..95c3e6c 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -338,19 +338,25 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
338 | // HandleRequest(request,resp); | 338 | // HandleRequest(request,resp); |
339 | // } | 339 | // } |
340 | 340 | ||
341 | /// <summary> | ||
342 | /// This methods is the start of incoming HTTP request handling. | ||
343 | /// </summary> | ||
344 | /// <param name="request"></param> | ||
345 | /// <param name="response"></param> | ||
341 | public virtual void HandleRequest(OSHttpRequest request, OSHttpResponse response) | 346 | public virtual void HandleRequest(OSHttpRequest request, OSHttpResponse response) |
342 | { | 347 | { |
343 | try | 348 | try |
344 | { | 349 | { |
350 | // m_log.Debug("[BASE HTTP SERVER]: Handling request to " + request.RawUrl); | ||
351 | |||
345 | Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true); | 352 | Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true); |
353 | |||
346 | // This is the REST agent interface. We require an agent to properly identify | 354 | // This is the REST agent interface. We require an agent to properly identify |
347 | // itself. If the REST handler recognizes the prefix it will attempt to | 355 | // itself. If the REST handler recognizes the prefix it will attempt to |
348 | // satisfy the request. If it is not recognizable, and no damage has occurred | 356 | // satisfy the request. If it is not recognizable, and no damage has occurred |
349 | // the request can be passed through to the other handlers. This is a low | 357 | // the request can be passed through to the other handlers. This is a low |
350 | // probability event; if a request is matched it is normally expected to be | 358 | // probability event; if a request is matched it is normally expected to be |
351 | // handled | 359 | // handled |
352 | // m_log.Debug("[BASE HTTP SERVER]: Handling request to " + request.RawUrl); | ||
353 | |||
354 | IHttpAgentHandler agentHandler; | 360 | IHttpAgentHandler agentHandler; |
355 | 361 | ||
356 | if (TryGetAgentHandler(request, response, out agentHandler)) | 362 | if (TryGetAgentHandler(request, response, out agentHandler)) |