Merge branch 'master' into careminster

This commit is contained in:
Melanie
2010-01-21 23:47:40 +00:00
6 changed files with 77 additions and 71 deletions

2
OpenSim/Framework/Console/ConsoleBase.cs Normal file → Executable file
View File

@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Console
public virtual void Output(string text)
{
System.Console.Write(text);
System.Console.WriteLine(text);
}
public string CmdPrompt(string p)

2
OpenSim/Framework/Console/ConsolePluginCommand.cs Normal file → Executable file
View File

@@ -124,7 +124,7 @@ namespace OpenSim.Framework.Console
/// </summary>
public void ShowHelp(ConsoleBase console)
{
console.Output(String.Join(" ", m_cmdText) + " - " + m_helpText);
console.Output(String.Join(" ", m_cmdText) + " - " + m_helpText + "\n");
}
/// <summary>