ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	CONTRIBUTORS.txt
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
This commit is contained in:
Melanie
2012-09-29 19:21:07 +01:00
parent 001ec0e2e6 4e9509dafa
commit 71dd55a1ce
29 changed files with 2264 additions and 1491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@@ -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"));
}
}