diff options
| author | Melanie | 2012-05-10 00:42:10 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-10 00:42:10 +0100 |
| commit | a90822f4b8ce8b10f8d38e09adf45a1e8e4ed86a (patch) | |
| tree | e14d17475f8dcf643f4153f882f92e89b869a686 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect the... (diff) | |
| download | opensim-SC_OLD-a90822f4b8ce8b10f8d38e09adf45a1e8e4ed86a.zip opensim-SC_OLD-a90822f4b8ce8b10f8d38e09adf45a1e8e4ed86a.tar.gz opensim-SC_OLD-a90822f4b8ce8b10f8d38e09adf45a1e8e4ed86a.tar.bz2 opensim-SC_OLD-a90822f4b8ce8b10f8d38e09adf45a1e8e4ed86a.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework')
| -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 9bb952d..f5addc8 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -447,8 +447,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 447 | { | 447 | { |
| 448 | if (DebugLevel >= 1) | 448 | if (DebugLevel >= 1) |
| 449 | m_log.DebugFormat( | 449 | m_log.DebugFormat( |
| 450 | "[BASE HTTP SERVER]: Found stream handler for {0} {1}", | 450 | "[BASE HTTP SERVER]: Found stream handler for {0} {1} {2} {3}", |
| 451 | request.HttpMethod, request.Url.PathAndQuery); | 451 | request.HttpMethod, request.Url.PathAndQuery, requestHandler.Name, requestHandler.Description); |
| 452 | 452 | ||
| 453 | // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler. | 453 | // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler. |
| 454 | byte[] buffer = null; | 454 | byte[] buffer = null; |