diff options
| author | Melanie | 2010-02-08 15:53:20 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-08 15:53:38 +0000 |
| commit | baaf660511214e52ea4ed20b8e80ec8e1ff06a3a (patch) | |
| tree | 1e90c7a22ea3354d6bfd5d2b3f8f64f199dbd477 /OpenSim/Framework/Console/ConsolePluginCommand.cs | |
| parent | Added missing configs to Standalone.ini (diff) | |
| parent | Adding the Careminster "Configger" tool to OpenSim. The tool will, when launched (diff) | |
| download | opensim-SC-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.zip opensim-SC-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.gz opensim-SC-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.bz2 opensim-SC-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.xz | |
Merge branch 'master' into presence-refactor
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
Diffstat (limited to 'OpenSim/Framework/Console/ConsolePluginCommand.cs')
| -rwxr-xr-x[-rw-r--r--] | OpenSim/Framework/Console/ConsolePluginCommand.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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> |