Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Dan Lake 2012-05-10 14:43:02 -0700
committer: Dan Lake 2012-05-10 14:43:02 -0700
commit: 117c183fde5c21bd87c99cb0af4c1903550570e9 (patch)
tree: d109468b072ec15d8a6afee384185aab3439b056 /OpenSim/Framework/Servers/HttpServer
parent: Add even for terrain tainting and synchronize terrain module with physics sce... (diff)
parent: Saving estate state is really slow (relatively) and it gets (diff)
download: opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.zip
opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.tar.gz
opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.tar.bz2
opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index d0463c8..401dfd3 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -447,8 +447,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                {
                    if (DebugLevel >= 1)
                        m_log.DebugFormat(
-                            "[BASE HTTP SERVER]: Found stream handler for {0} {1}",
+                            "[BASE HTTP SERVER]: Found stream handler for {0} {1} {2} {3}",
-                            request.HttpMethod, request.Url.PathAndQuery);
+                            request.HttpMethod, request.Url.PathAndQuery, requestHandler.Name, requestHandler.Description);
                    // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler.
                    byte[] buffer = null;
author	Dan Lake	2012-05-10 14:43:02 -0700
committer	Dan Lake	2012-05-10 14:43:02 -0700
commit	117c183fde5c21bd87c99cb0af4c1903550570e9 (patch)
tree	d109468b072ec15d8a6afee384185aab3439b056 /OpenSim/Framework/Servers/HttpServer
parent	Add even for terrain tainting and synchronize terrain module with physics sce... (diff)
parent	Saving estate state is really slow (relatively) and it gets (diff)
download	opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.zip opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.tar.gz opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.tar.bz2 opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.tar.xz

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index d0463c8..401dfd3 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;