diff options
author | Melanie | 2012-11-20 20:25:15 +0000 |
---|---|---|
committer | Melanie | 2012-11-20 20:25:15 +0000 |
commit | 45eedb635a6d51efba2549802b75ea1369274409 (patch) | |
tree | 2689020c58f6fae0872a130584331e84ba591d15 /OpenSim/Framework | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | If GetAgents() is called with an empty userIDs array then don't bother with a... (diff) | |
download | opensim-SC_OLD-45eedb635a6d51efba2549802b75ea1369274409.zip opensim-SC_OLD-45eedb635a6d51efba2549802b75ea1369274409.tar.gz opensim-SC_OLD-45eedb635a6d51efba2549802b75ea1369274409.tar.bz2 opensim-SC_OLD-45eedb635a6d51efba2549802b75ea1369274409.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 3198891..77fce9e 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -720,8 +720,11 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
720 | if (DebugLevel == 5) | 720 | if (DebugLevel == 5) |
721 | { | 721 | { |
722 | const int sampleLength = 80; | 722 | const int sampleLength = 80; |
723 | char[] sampleChars = new char[sampleLength]; | 723 | char[] sampleChars = new char[sampleLength + 3]; |
724 | reader.Read(sampleChars, 0, sampleLength); | 724 | reader.Read(sampleChars, 0, sampleLength); |
725 | sampleChars[80] = '.'; | ||
726 | sampleChars[81] = '.'; | ||
727 | sampleChars[82] = '.'; | ||
725 | output = new string(sampleChars); | 728 | output = new string(sampleChars); |
726 | } | 729 | } |
727 | else | 730 | else |
@@ -729,7 +732,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
729 | output = reader.ReadToEnd(); | 732 | output = reader.ReadToEnd(); |
730 | } | 733 | } |
731 | 734 | ||
732 | m_log.DebugFormat("[BASE HTTP SERVER]: {0}...", output.Replace("\n", @"\n")); | 735 | m_log.DebugFormat("[BASE HTTP SERVER]: {0}", output.Replace("\n", @"\n")); |
733 | } | 736 | } |
734 | } | 737 | } |
735 | 738 | ||