diff options
| author | Melanie | 2012-09-29 19:21:07 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-29 19:21:07 +0100 |
| commit | 71dd55a1ce8560dba3fbab76e25bbeaf974f422a (patch) | |
| tree | b1c3759d25e29b8ab9b2c61da3f408c6aa7803f4 /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Get rid of some unnecessary casts in RemoteAdminPlugin. (diff) | |
| download | opensim-SC_OLD-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.zip opensim-SC_OLD-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.tar.gz opensim-SC_OLD-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.tar.bz2 opensim-SC_OLD-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
CONTRIBUTORS.txt
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 6 |
1 files changed, 3 insertions, 3 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 | |||
| 728 | const int sampleLength = 80; | 728 | const int sampleLength = 80; |
| 729 | char[] sampleChars = new char[sampleLength]; | 729 | char[] sampleChars = new char[sampleLength]; |
| 730 | reader.Read(sampleChars, 0, sampleLength); | 730 | reader.Read(sampleChars, 0, sampleLength); |
| 731 | output = string.Format("[BASE HTTP SERVER]: {0}...", new string(sampleChars).Replace("\n", @"\n")); | 731 | output = new string(sampleChars); |
| 732 | } | 732 | } |
| 733 | else | 733 | else |
| 734 | { | 734 | { |
| 735 | output = string.Format("[BASE HTTP SERVER]: {0}", reader.ReadToEnd()); | 735 | output = reader.ReadToEnd(); |
| 736 | } | 736 | } |
| 737 | 737 | ||
| 738 | m_log.Debug(output); | 738 | m_log.DebugFormat("[BASE HTTP SERVER]: {0}...", output.Replace("\n", @"\n")); |
| 739 | } | 739 | } |
| 740 | } | 740 | } |
| 741 | 741 | ||