Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into arthursv

3 files changed, 10 insertions, 4 deletions

diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index 3387013..06136ff 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -576,7 +576,7 @@ namespace OpenSim.Framework.Console
 
         public void Prompt()
         {
-            string line = ReadLine(m_defaultPrompt, true, true);
+            string line = ReadLine(m_defaultPrompt + "# ", true, true);
 
             if (line != String.Empty)
             {
@@ -592,7 +592,7 @@ namespace OpenSim.Framework.Console
 
         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();
 
             if (isCommand)
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 5e258ae..0a51266 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Console
         /// </summary>
         public string DefaultPrompt
         {
-            set { m_defaultPrompt = value + "# "; }
+            set { m_defaultPrompt = value; }
             get { return m_defaultPrompt; }
         }
         protected string m_defaultPrompt;
@@ -123,7 +123,7 @@ namespace OpenSim.Framework.Console
 
         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();
 
             return cmdinput;
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index da8556a..1810614 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -217,6 +217,12 @@ namespace OpenSim.Framework.Console
             id.AppendChild(xmldoc.CreateTextNode(sessionID.ToString()));
 
             rootElement.AppendChild(id);
+
+            XmlElement prompt = xmldoc.CreateElement("", "Prompt", "");
+            prompt.AppendChild(xmldoc.CreateTextNode(DefaultPrompt));
+
+            rootElement.AppendChild(prompt);
+
             rootElement.AppendChild(MainConsole.Instance.Commands.GetXml(xmldoc));
 
             reply["str_response_string"] = xmldoc.InnerXml;