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/ConsoleBase.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/ConsoleBase.cs')
| -rwxr-xr-x[-rw-r--r--] | OpenSim/Framework/Console/ConsoleBase.cs | 2 |
1 files changed, 1 insertions, 1 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) |