diff options
| author | Diva Canto | 2012-09-13 10:00:52 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-09-13 10:00:52 -0700 |
| commit | dd0a89a0e64573fd947928050d03e8389d95c799 (patch) | |
| tree | 7920b18d85f6e1e1a43525f548774bca1fa75aac /OpenSim/Framework | |
| parent | Restarting to work on HGSuitcaseInventoryService: added the ability for the o... (diff) | |
| parent | Documentation of parcel-related events (diff) | |
| download | opensim-SC_OLD-dd0a89a0e64573fd947928050d03e8389d95c799.zip opensim-SC_OLD-dd0a89a0e64573fd947928050d03e8389d95c799.tar.gz opensim-SC_OLD-dd0a89a0e64573fd947928050d03e8389d95c799.tar.bz2 opensim-SC_OLD-dd0a89a0e64573fd947928050d03e8389d95c799.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Framework/Servers/MainServer.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index c81e283..43a19fa 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -687,7 +687,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 687 | const int sampleLength = 80; | 687 | const int sampleLength = 80; |
| 688 | char[] sampleChars = new char[sampleLength]; | 688 | char[] sampleChars = new char[sampleLength]; |
| 689 | reader.Read(sampleChars, 0, sampleLength); | 689 | reader.Read(sampleChars, 0, sampleLength); |
| 690 | output = string.Format("[BASE HTTP SERVER]: {0}...", sampleChars); | 690 | output = string.Format("[BASE HTTP SERVER]: {0}...", new string(sampleChars).Replace("\n", @"\n")); |
| 691 | } | 691 | } |
| 692 | else | 692 | else |
| 693 | { | 693 | { |
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs index b367b12..7402c73 100644 --- a/OpenSim/Framework/Servers/MainServer.cs +++ b/OpenSim/Framework/Servers/MainServer.cs | |||
| @@ -144,7 +144,7 @@ namespace OpenSim.Framework.Servers | |||
| 144 | } | 144 | } |
| 145 | else | 145 | else |
| 146 | { | 146 | { |
| 147 | MainConsole.Instance.Output("Usage: debug http 0..3"); | 147 | MainConsole.Instance.Output("Usage: debug http 0..5"); |
| 148 | } | 148 | } |
| 149 | } | 149 | } |
| 150 | 150 | ||