OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change prompt handling in console. No user changes

remotes/origin/0.6.7-post-fixes
Melanie 2009-08-22 20:18:24 +01:00
parent 173701dd63
commit a22b12ecd4
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Console/CommandConsole.cs
View File

@ -576,7 +576,7 @@ namespace OpenSim.Framework.Console
public void Prompt() public void Prompt()
{ {
string line = ReadLine(m_defaultPrompt, true, true); string line = ReadLine(m_defaultPrompt + "# ", true, true);
if (line != String.Empty) if (line != String.Empty)
{ {
@ -592,7 +592,7 @@ namespace OpenSim.Framework.Console
public override string ReadLine(string p, bool isCommand, bool e) public override string ReadLine(string p, bool isCommand, bool e)
{ {
System.Console.Write("{0}", prompt); System.Console.Write("{0}", p);
string cmdinput = System.Console.ReadLine(); string cmdinput = System.Console.ReadLine();
if (isCommand) if (isCommand)

4
OpenSim/Framework/Console/ConsoleBase.cs
View File

@ -48,7 +48,7 @@ namespace OpenSim.Framework.Console
/// </summary> /// </summary>
public string DefaultPrompt public string DefaultPrompt
{ {
set { m_defaultPrompt = value + "# "; } set { m_defaultPrompt = value; }
get { return m_defaultPrompt; } get { return m_defaultPrompt; }
} }
protected string m_defaultPrompt; protected string m_defaultPrompt;
@ -123,7 +123,7 @@ namespace OpenSim.Framework.Console
public virtual string ReadLine(string p, bool isCommand, bool e) public virtual string ReadLine(string p, bool isCommand, bool e)
{ {
System.Console.Write("{0}", prompt); System.Console.Write("{0}", p);
string cmdinput = System.Console.ReadLine(); string cmdinput = System.Console.ReadLine();
return cmdinput; return cmdinput;

6
OpenSim/Framework/Console/RemoteConsole.cs
View File

@ -217,6 +217,12 @@ namespace OpenSim.Framework.Console
id.AppendChild(xmldoc.CreateTextNode(sessionID.ToString())); id.AppendChild(xmldoc.CreateTextNode(sessionID.ToString()));
rootElement.AppendChild(id); rootElement.AppendChild(id);
XmlElement prompt = xmldoc.CreateElement("", "Prompt", "");
prompt.AppendChild(xmldoc.CreateTextNode(DefaultPrompt));
rootElement.AppendChild(prompt);
rootElement.AppendChild(MainConsole.Instance.Commands.GetXml(xmldoc)); rootElement.AppendChild(MainConsole.Instance.Commands.GetXml(xmldoc));
reply["str_response_string"] = xmldoc.InnerXml; reply["str_response_string"] = xmldoc.InnerXml;