diff options
| author | Melanie | 2010-01-21 23:47:40 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-21 23:47:40 +0000 |
| commit | 946e06eb58bee7aaedf8b08c44a1e4cf2d63511e (patch) | |
| tree | 5a142aa20973a787bc8353df5bd2027bc4984c10 /OpenSim/Framework/Console | |
| parent | Adds example to OpenSim.ini.example for Admin Default Parcel settings (diff) | |
| parent | Fixes llSetDamage. Patch from Revolution (diff) | |
| download | opensim-SC-946e06eb58bee7aaedf8b08c44a1e4cf2d63511e.zip opensim-SC-946e06eb58bee7aaedf8b08c44a1e4cf2d63511e.tar.gz opensim-SC-946e06eb58bee7aaedf8b08c44a1e4cf2d63511e.tar.bz2 opensim-SC-946e06eb58bee7aaedf8b08c44a1e4cf2d63511e.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework/Console')
| -rwxr-xr-x[-rw-r--r--] | OpenSim/Framework/Console/ConsoleBase.cs | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | OpenSim/Framework/Console/ConsolePluginCommand.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs index 0a51266..b70d1db 100644..100755 --- a/OpenSim/Framework/Console/ConsoleBase.cs +++ b/OpenSim/Framework/Console/ConsoleBase.cs | |||
| @@ -73,7 +73,7 @@ namespace OpenSim.Framework.Console | |||
| 73 | 73 | ||
| 74 | public virtual void Output(string text) | 74 | public virtual void Output(string text) |
| 75 | { | 75 | { |
| 76 | System.Console.Write(text); | 76 | System.Console.WriteLine(text); |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | public string CmdPrompt(string p) | 79 | public string CmdPrompt(string p) |
diff --git a/OpenSim/Framework/Console/ConsolePluginCommand.cs b/OpenSim/Framework/Console/ConsolePluginCommand.cs index a2f31ea..f4d3687 100644..100755 --- a/OpenSim/Framework/Console/ConsolePluginCommand.cs +++ b/OpenSim/Framework/Console/ConsolePluginCommand.cs | |||
| @@ -124,7 +124,7 @@ namespace OpenSim.Framework.Console | |||
| 124 | /// </summary> | 124 | /// </summary> |
| 125 | public void ShowHelp(ConsoleBase console) | 125 | public void ShowHelp(ConsoleBase console) |
| 126 | { | 126 | { |
| 127 | console.Output(String.Join(" ", m_cmdText) + " - " + m_helpText); | 127 | console.Output(String.Join(" ", m_cmdText) + " - " + m_helpText + "\n"); |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | /// <summary> | 130 | /// <summary> |