Merge branch 'master' into careminster

Conflicts:
	CONTRIBUTORS.txt
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs

2 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 1d35b1a..b3e31a6 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -728,14 +728,14 @@ namespace OpenSim.Framework.Servers.HttpServer
                     const int sampleLength = 80;
                     char[] sampleChars = new char[sampleLength];
                     reader.Read(sampleChars, 0, sampleLength);
-                    output = string.Format("[BASE HTTP SERVER]: {0}...", new string(sampleChars).Replace("\n", @"\n"));
+                    output = new string(sampleChars);
                 }
                 else
                 {
-                    output = string.Format("[BASE HTTP SERVER]: {0}", reader.ReadToEnd());
+                    output = reader.ReadToEnd();
                 }
 
-                m_log.Debug(output);
+                m_log.DebugFormat("[BASE HTTP SERVER]: {0}...", output.Replace("\n", @"\n"));
             }
         }
 
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index 4b61b18..ae7d515 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -177,9 +177,9 @@ namespace OpenSim.Framework.Servers
                     return;
                 }
 
-                if (newDebug < 0 || newDebug > 5)
+                if (newDebug < 0 || newDebug > 6)
                 {
-                    MainConsole.Instance.OutputFormat("{0} is outside the valid debug level range of 0..5", newDebug);
+                    MainConsole.Instance.OutputFormat("{0} is outside the valid debug level range of 0..6", newDebug);
                     return;
                 }