diff options
| author | Diva Canto | 2012-09-30 06:52:19 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-09-30 06:52:19 -0700 |
| commit | 14a4b146bf7f3552defcbe1e99fdbc64cb8fbf9c (patch) | |
| tree | 3c76fe34e863fa990c6da0f72d8350c7476cf1e4 /OpenSim/Framework/Servers/HttpServer | |
| parent | Made a method of GridUserService virtual so it can be overridden. (diff) | |
| parent | Get rid of some unnecessary casts in RemoteAdminPlugin. (diff) | |
| download | opensim-SC-14a4b146bf7f3552defcbe1e99fdbc64cb8fbf9c.zip opensim-SC-14a4b146bf7f3552defcbe1e99fdbc64cb8fbf9c.tar.gz opensim-SC-14a4b146bf7f3552defcbe1e99fdbc64cb8fbf9c.tar.bz2 opensim-SC-14a4b146bf7f3552defcbe1e99fdbc64cb8fbf9c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
| -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 d139235..ff57422 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -727,14 +727,14 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 727 | const int sampleLength = 80; | 727 | const int sampleLength = 80; |
| 728 | char[] sampleChars = new char[sampleLength]; | 728 | char[] sampleChars = new char[sampleLength]; |
| 729 | reader.Read(sampleChars, 0, sampleLength); | 729 | reader.Read(sampleChars, 0, sampleLength); |
| 730 | output = string.Format("[BASE HTTP SERVER]: {0}...", new string(sampleChars).Replace("\n", @"\n")); | 730 | output = new string(sampleChars); |
| 731 | } | 731 | } |
| 732 | else | 732 | else |
| 733 | { | 733 | { |
| 734 | output = string.Format("[BASE HTTP SERVER]: {0}", reader.ReadToEnd()); | 734 | output = reader.ReadToEnd(); |
| 735 | } | 735 | } |
| 736 | 736 | ||
| 737 | m_log.Debug(output); | 737 | m_log.DebugFormat("[BASE HTTP SERVER]: {0}...", output.Replace("\n", @"\n")); |
| 738 | } | 738 | } |
| 739 | } | 739 | } |
| 740 | 740 | ||