8 files changed, 315 insertions, 106 deletions

diff --git a/OpenSim/Framework/Console/AssemblyInfo.cs b/OpenSim/Framework/Console/AssemblyInfo.cs
index 67af471..c53d92b 100644
--- a/OpenSim/Framework/Console/AssemblyInfo.cs
+++ b/OpenSim/Framework/Console/AssemblyInfo.cs
@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly : AssemblyVersion("0.8.2.*")]
+[assembly : AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index 0f68afe..52360b4 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -52,27 +52,27 @@ namespace OpenSim.Framework.Console
             /// The module from which this command comes
             /// </value>
             public string module;
-            
+
             /// <value>
             /// Whether the module is shared
             /// </value>
             public bool shared;
-            
+
             /// <value>
             /// Very short BNF description
             /// </value>
             public string help_text;
-            
+
             /// <value>
             /// Longer one line help text
             /// </value>
             public string long_help;
-            
+
             /// <value>
             /// Full descriptive help for this command
             /// </value>
             public string descriptive_help;
-            
+
             /// <value>
             /// The method to invoke for this command
             /// </value>
@@ -83,8 +83,8 @@ namespace OpenSim.Framework.Console
             = "To enter an argument that contains spaces, surround the argument with double quotes.\nFor example, show object name \"My long object name\"\n";
 
         public const string ItemHelpText
-= @"For more information, type 'help all' to get a list of all commands, 
-  or type help <item>' where <item> is one of the following:";
+            = @"For more information, type 'help all' to get a list of all commands,
+              or type help <item>' where <item> is one of the following:";
 
         /// <value>
         /// Commands organized by keyword in a tree
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.Console
         {
             List<string> help = new List<string>();
             List<string> helpParts = new List<string>(cmd);
-            
+
             // Remove initial help keyword
             helpParts.RemoveAt(0);
 
@@ -154,7 +154,7 @@ namespace OpenSim.Framework.Console
 
             return help;
         }
-        
+
         /// <summary>
         /// See if we can find the requested command in order to display longer help
         /// </summary>
@@ -171,23 +171,23 @@ namespace OpenSim.Framework.Console
                 help.Insert(0, ItemHelpText);
                 return help;
             }
-            
+
             Dictionary<string, object> dict = tree;
             while (helpParts.Count > 0)
             {
                 string helpPart = helpParts[0];
-                
+
                 if (!dict.ContainsKey(helpPart))
                     break;
-                
+
                 //m_log.Debug("Found {0}", helpParts[0]);
-                
+
                 if (dict[helpPart] is Dictionary<string, Object>)
-                    dict = (Dictionary<string, object>)dict[helpPart]; 
-                
+                    dict = (Dictionary<string, object>)dict[helpPart];
+
                 helpParts.RemoveAt(0);
             }
-        
+
             // There was a command for the given help string
             if (dict.ContainsKey(String.Empty))
             {
@@ -200,14 +200,14 @@ namespace OpenSim.Framework.Console
                 // If we do have some descriptive help then insert a spacing line before for readability.
                 if (descriptiveHelp != string.Empty)
                     help.Add(string.Empty);
-                
+
                 help.Add(commandInfo.descriptive_help);
             }
             else
             {
                 help.Add(string.Format("No help is available for {0}", originalHelpRequest));
             }
-            
+
             return help;
         }
 
@@ -268,7 +268,7 @@ namespace OpenSim.Framework.Console
 //            }
 //            return result;
 //        }
-        
+
         /// <summary>
         /// Add a command to those which can be invoked from the console.
         /// </summary>
@@ -299,7 +299,7 @@ namespace OpenSim.Framework.Console
             string[] parts = Parser.Parse(command);
 
             Dictionary<string, Object> current = tree;
-            
+
             foreach (string part in parts)
             {
                 if (current.ContainsKey(part))
@@ -326,7 +326,7 @@ namespace OpenSim.Framework.Console
 
                 return;
             }
-            
+
             info = new CommandInfo();
             info.module = module;
             info.shared = shared;
@@ -471,7 +471,7 @@ namespace OpenSim.Framework.Console
 
             return null;
         }
-                
+
         public bool HasCommand(string command)
         {
             string[] result;
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 2d8e723..64cddea 100644..100755
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Framework.Console
         {
             System.Console.WriteLine(text);
         }
-        
+
         public virtual void OutputFormat(string format, params object[] components)
         {
             Output(string.Format(format, components));
@@ -86,7 +86,7 @@ namespace OpenSim.Framework.Console
 
             return ret;
         }
-                
+
         public string CmdPrompt(string p, List<char> excludedCharacters)
         {
             bool itisdone = false;
@@ -95,7 +95,7 @@ namespace OpenSim.Framework.Console
             {
                 itisdone = true;
                 ret = CmdPrompt(p);
-                
+
                 foreach (char c in excludedCharacters)
                 {
                     if (ret.Contains(c.ToString()))
@@ -117,7 +117,7 @@ namespace OpenSim.Framework.Console
             {
                 itisdone = true;
                 ret = CmdPrompt(p, def);
-                
+
                 if (ret == String.Empty)
                 {
                     ret = def;
diff --git a/OpenSim/Framework/Console/ConsolePluginCommand.cs b/OpenSim/Framework/Console/ConsolePluginCommand.cs
index f4d3687..f4d3687 100644..100755
--- a/OpenSim/Framework/Console/ConsolePluginCommand.cs
+++ b/OpenSim/Framework/Console/ConsolePluginCommand.cs
diff --git a/OpenSim/Framework/Console/ConsoleUtil.cs b/OpenSim/Framework/Console/ConsoleUtil.cs
index 44f6dc1..bfa05a2 100644
--- a/OpenSim/Framework/Console/ConsoleUtil.cs
+++ b/OpenSim/Framework/Console/ConsoleUtil.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Console
     //    private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public const int LocalIdNotFound = 0;
-    
+
         /// <summary>
         /// Used by modules to display stock co-ordinate help, though possibly this should be under some general section
         /// rather than in each help summary.
@@ -57,10 +57,10 @@ namespace OpenSim.Framework.Console
     show object pos ,20,20 to ,40,40
     delete object pos ,,30 to ,,~
     show object pos ,,-~ to ,,30";
-    
+
         public const string MinRawConsoleVectorValue = "-~";
         public const string MaxRawConsoleVectorValue = "~";
-    
+
         public const string VectorSeparator = ",";
         public static char[] VectorSeparatorChars = VectorSeparator.ToCharArray();
 
@@ -81,7 +81,7 @@ namespace OpenSim.Framework.Console
 
             return true;
         }
-    
+
         /// <summary>
         /// Try to parse a console UUID from the console.
         /// </summary>
@@ -101,7 +101,7 @@ namespace OpenSim.Framework.Console
 
                 return false;
             }
-    
+
             return true;
         }
 
@@ -259,7 +259,7 @@ namespace OpenSim.Framework.Console
 
             return false;
         }
-    
+
         /// <summary>
         /// Convert a minimum vector input from the console to an OpenMetaverse.Vector3
         /// </summary>
@@ -270,7 +270,7 @@ namespace OpenSim.Framework.Console
         {
             return TryParseConsoleVector(rawConsoleVector, c => float.MinValue.ToString(), out vector);
         }
-    
+
         /// <summary>
         /// Convert a maximum vector input from the console to an OpenMetaverse.Vector3
         /// </summary>
@@ -281,7 +281,7 @@ namespace OpenSim.Framework.Console
         {
             return TryParseConsoleVector(rawConsoleVector, c => float.MaxValue.ToString(), out vector);
         }
-    
+
         /// <summary>
         /// Convert a vector input from the console to an OpenMetaverse.Vector3
         /// </summary>
@@ -354,10 +354,10 @@ namespace OpenSim.Framework.Console
             string rawConsoleVector, int dimensions, Func<string, string> blankComponentFunc)
         {
             List<string> components = rawConsoleVector.Split(VectorSeparatorChars).ToList();
-    
+
             if (components.Count < 1 || components.Count > dimensions)
                 return null;
-    
+
             if (components.Count < dimensions)
             {
                 if (blankComponentFunc == null)
@@ -380,7 +380,7 @@ namespace OpenSim.Framework.Console
                         else
                             return c;
                     });
-    
+
             return string.Join(VectorSeparator, cookedComponents.ToArray());
         }
     }
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index d8f8ecc..73f0323 100644
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Console
         private const string LOGLEVEL_NONE = "(none)";
 
         // Used to extract categories for colourization.
-        private Regex m_categoryRegex 
+        private Regex m_categoryRegex
             = new Regex(
                 @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)", RegexOptions.Singleline | RegexOptions.Compiled);
 
@@ -97,7 +97,7 @@ namespace OpenSim.Framework.Console
 
             string m_historyFile = startupConfig.GetString("ConsoleHistoryFile", "OpenSimConsoleHistory.txt");
             int m_historySize = startupConfig.GetInt("ConsoleHistoryFileLines", 100);
-            m_historyPath = Path.GetFullPath(Path.Combine("../caches", m_historyFile));
+            m_historyPath = Path.GetFullPath(Path.Combine(Util.configDir(), m_historyFile));
             m_log.InfoFormat("[LOCAL CONSOLE]: Persistent command line history is Enabled, up to {0} lines from file {1}", m_historySize, m_historyPath);
 
             if (File.Exists(m_historyPath))
@@ -167,15 +167,15 @@ namespace OpenSim.Framework.Console
             {
                 System.Console.CursorLeft = 0;
             }
-            else 
+            else
             {
                 int bufferWidth = System.Console.BufferWidth;
-                
+
                 // On Mono 2.4.2.3 (and possibly above), the buffer value is sometimes erroneously zero (Mantis 4657)
                 if (bufferWidth > 0 && left >= bufferWidth)
                     System.Console.CursorLeft = bufferWidth - 1;
             }
-            
+
             if (top < 0)
             {
                 top = 0;
@@ -183,7 +183,7 @@ namespace OpenSim.Framework.Console
             else
             {
                 int bufferHeight = System.Console.BufferHeight;
-                
+
                 // On Mono 2.4.2.3 (and possibly above), the buffer value is sometimes erroneously zero (Mantis 4657)
                 if (bufferHeight > 0 && top >= bufferHeight)
                     top = bufferHeight - 1;
@@ -216,14 +216,14 @@ namespace OpenSim.Framework.Console
             {
                 System.Console.CursorTop = 0;
             }
-            else 
+            else
             {
                 int bufferHeight = System.Console.BufferHeight;
                 // On Mono 2.4.2.3 (and possibly above), the buffer value is sometimes erroneously zero (Mantis 4657)
                 if (bufferHeight > 0 && top >= bufferHeight)
                     System.Console.CursorTop = bufferHeight - 1;
             }
-            
+
             if (left < 0)
             {
                 left = 0;
@@ -339,7 +339,7 @@ namespace OpenSim.Framework.Console
             string outText = text;
 
             if (level != LOGLEVEL_NONE)
-            {               
+            {
                 MatchCollection matches = m_categoryRegex.Matches(text);
 
                 if (matches.Count == 1)
@@ -364,7 +364,7 @@ namespace OpenSim.Framework.Console
                 WriteColorText(ConsoleColor.Yellow, outText);
             else
                 System.Console.Write(outText);
-        
+
             System.Console.WriteLine();
         }
 
@@ -551,7 +551,7 @@ namespace OpenSim.Framework.Console
                         }
 
                         string commandLine = m_commandLine.ToString();
-                        
+
                         if (isCommand)
                         {
                             string[] cmd = Commands.Resolve(Parser.Parse(commandLine));
@@ -573,7 +573,7 @@ namespace OpenSim.Framework.Console
                         // If we're not echoing to screen (e.g. a password) then we probably don't want it in history
                         if (m_echo && commandLine != "")
                             AddToHistory(commandLine);
-                        
+
                         return commandLine;
                     default:
                         break;
diff --git a/OpenSim/Framework/Console/MockConsole.cs b/OpenSim/Framework/Console/MockConsole.cs
index 1a142df..e1ff720 100644
--- a/OpenSim/Framework/Console/MockConsole.cs
+++ b/OpenSim/Framework/Console/MockConsole.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Framework.Console
 {
     /// <summary>
     /// This is a Fake console that's used when setting up the Scene in Unit Tests
-    /// Don't use this except for Unit Testing or you're in for a world of hurt when the 
+    /// Don't use this except for Unit Testing or you're in for a world of hurt when the
     /// sim gets to ReadLine
     /// </summary>
     public class MockConsole : ICommandConsole
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.Console
 
         public string ReadLine(string p, bool isCommand, bool e) { return ""; }
 
-        public object ConsoleScene { 
+        public object ConsoleScene {
             get { return null; }
             set {}
         }
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 8ad7b0d..f59c902 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -34,6 +34,7 @@ using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
+using System.Timers;
 using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Framework.Servers.HttpServer;
@@ -41,51 +42,147 @@ using log4net;
 
 namespace OpenSim.Framework.Console
 {
-    public class ConsoleConnection
-    {
-        public int last;
-        public long lastLineSeen;
-        public bool newConnection = true;
-    }
-
     // A console that uses REST interfaces
     //
     public class RemoteConsole : CommandConsole
     {
-        private IHttpServer m_Server = null;
-        private IConfigSource m_Config = null;
-
-        private List<string> m_Scrollback = new List<string>();
-        private ManualResetEvent m_DataEvent = new ManualResetEvent(false);
-        private List<string> m_InputData = new List<string>();
-        private long m_LineNumber = 0;
-        private Dictionary<UUID, ConsoleConnection> m_Connections =
+        // Connection specific data, indexed by a session ID
+        // we create when a client connects.
+        protected class ConsoleConnection
+        {
+            // Last activity from the client
+            public int last;
+
+            // Last line of scrollback posted to this client
+            public long lastLineSeen;
+
+            // True if this is a new connection, e.g. has never
+            // displayed a prompt to the user.
+            public bool newConnection = true;
+        }
+
+        // A line in the scrollback buffer.
+        protected class ScrollbackEntry
+        {
+            // The line number of this entry
+            public long lineNumber;
+
+            // The text to send to the client
+            public string text;
+
+            // The level this should be logged as. Omitted for
+            // prompts and input echo.
+            public string level;
+
+            // True if the text above is a prompt, e.g. the
+            // client should turn on the cursor / accept input
+            public bool isPrompt;
+
+            // True if the requested input is a command. A
+            // client may offer help or validate input if
+            // this is set. If false, input should be sent
+            // as typed.
+            public bool isCommand;
+
+            // True if this text represents a line of text that
+            // was input in response to a prompt. A client should
+            // turn off the cursor and refrain from sending commands
+            // until a new prompt is received.
+            public bool isInput;
+        }
+
+        // Data that is relevant to all connections
+
+        // The scrollback buffer
+        protected List<ScrollbackEntry> m_Scrollback = new List<ScrollbackEntry>();
+
+        // Monotonously incrementing line number. This may eventually
+        // wrap. No provision is made for that case because 64 bits
+        // is a long, long time.
+        protected long m_lineNumber = 0;
+
+        // These two variables allow us to send the correct
+        // information about the prompt status to the client,
+        // irrespective of what may have run off the top of the
+        // scrollback buffer;
+        protected bool m_expectingInput = false;
+        protected bool m_expectingCommand = true;
+        protected string m_lastPromptUsed;
+
+        // This is the list of things received from clients.
+        // Note: Race conditions can happen. If a client sends
+        // something while nothing is expected, it will be
+        // intepreted as input to the next prompt. For
+        // commands this is largely correct. For other prompts,
+        // YMMV.
+        // TODO: Find a better way to fix this
+        protected List<string> m_InputData = new List<string>();
+
+        // Event to allow ReadLine to wait synchronously even though
+        // everthing else is asynchronous here.
+        protected ManualResetEvent m_DataEvent = new ManualResetEvent(false);
+
+        // The list of sessions we maintain. Unlike other console types,
+        // multiple users on the same console are explicitly allowed.
+        protected Dictionary<UUID, ConsoleConnection> m_Connections =
                 new Dictionary<UUID, ConsoleConnection>();
-        private string m_UserName = String.Empty;
-        private string m_Password = String.Empty;
-        private string m_AllowedOrigin = String.Empty;
+
+        // Timer to control expiration of sessions that have been
+        // disconnected.
+        protected System.Timers.Timer m_expireTimer = new System.Timers.Timer(5000);
+
+        // The less interesting stuff that makes the actual server
+        // work.
+        protected IHttpServer m_Server = null;
+        protected IConfigSource m_Config = null;
+
+        protected string m_UserName = String.Empty;
+        protected string m_Password = String.Empty;
+        protected string m_AllowedOrigin = String.Empty;
+
 
         public RemoteConsole(string defaultPrompt) : base(defaultPrompt)
         {
+            // There is something wrong with this architecture.
+            // A prompt is sent on every single input, so why have this?
+            // TODO: Investigate and fix.
+            m_lastPromptUsed = defaultPrompt;
+
+            // Start expiration of sesssions.
+            m_expireTimer.Elapsed += DoExpire;
+            m_expireTimer.Start();
         }
 
         public void ReadConfig(IConfigSource config)
         {
             m_Config = config;
 
+            // We're pulling this from the 'Network' section for legacy
+            // compatibility. However, this is so essentially insecure
+            // that TLS and client certs should be used instead of
+            // a username / password.
             IConfig netConfig = m_Config.Configs["Network"];
+
             if (netConfig == null)
                 return;
 
+            // Get the username and password.
             m_UserName = netConfig.GetString("ConsoleUser", String.Empty);
             m_Password = netConfig.GetString("ConsolePass", String.Empty);
+
+            // Woefully underdocumented, this is what makes javascript
+            // console clients work. Set to "*" for anywhere or (better)
+            // to specific addresses.
             m_AllowedOrigin = netConfig.GetString("ConsoleAllowedOrigin", String.Empty);
         }
 
         public void SetServer(IHttpServer server)
         {
+            // This is called by the framework to give us the server
+            // instance (means: port) to work with.
             m_Server = server;
 
+            // Add our handlers
             m_Server.AddHTTPHandler("/StartSession/", HandleHttpStartSession);
             m_Server.AddHTTPHandler("/CloseSession/", HandleHttpCloseSession);
             m_Server.AddHTTPHandler("/SessionCommand/", HandleHttpSessionCommand);
@@ -93,38 +190,84 @@ namespace OpenSim.Framework.Console
 
         public override void Output(string text, string level)
         {
+            Output(text, level, false, false, false);
+        }
+
+        protected void Output(string text, string level, bool isPrompt, bool isCommand, bool isInput)
+        {
+            // Increment the line number. It was 0 and they start at 1
+            // so we need to pre-increment.
+            m_lineNumber++;
+
+            // Create and populate the new entry.
+            ScrollbackEntry newEntry = new ScrollbackEntry();
+
+            newEntry.lineNumber = m_lineNumber;
+            newEntry.text = text;
+            newEntry.level = level;
+            newEntry.isPrompt = isPrompt;
+            newEntry.isCommand = isCommand;
+            newEntry.isInput = isInput;
+
+            // Add a line to the scrollback. In some cases, that may not
+            // actually be a line of text.
             lock (m_Scrollback)
             {
+                // Prune the scrollback to the length se send as connect
+                // burst to give the user some context.
                 while (m_Scrollback.Count >= 1000)
                     m_Scrollback.RemoveAt(0);
-                m_LineNumber++;
-                m_Scrollback.Add(String.Format("{0}", m_LineNumber)+":"+level+":"+text);
+
+                m_Scrollback.Add(newEntry);
             }
+
+            // Let the rest of the system know we have output something.
             FireOnOutput(text.Trim());
+
+            // Also display it for debugging.
             System.Console.WriteLine(text.Trim());
         }
 
         public override void Output(string text)
         {
-            Output(text, "normal");
+            // Output plain (non-logging style) text.
+            Output(text, String.Empty, false, false, false);
         }
 
         public override string ReadLine(string p, bool isCommand, bool e)
         {
+            // Output the prompt an prepare to wait. This
+            // is called on a dedicated console thread and
+            // needs to be synchronous. Old architecture but
+            // not worth upgrading.
             if (isCommand)
-                Output("+++"+p);
+            {
+                m_expectingInput = true;
+                m_expectingCommand = true;
+                Output(p, String.Empty, true, true, false);
+                m_lastPromptUsed = p;
+            }
             else
-                Output("-++"+p);
+            {
+                m_expectingInput = true;
+                Output(p, String.Empty, true, false, false);
+            }
 
+
+            // Here is where we wait for the user to input something.
             m_DataEvent.WaitOne();
 
             string cmdinput;
 
+            // Check for empty input. Read input if not empty.
             lock (m_InputData)
             {
                 if (m_InputData.Count == 0)
                 {
                     m_DataEvent.Reset();
+                    m_expectingInput = false;
+                    m_expectingCommand = false;
+
                     return "";
                 }
 
@@ -135,8 +278,19 @@ namespace OpenSim.Framework.Console
 
             }
 
+            m_expectingInput = false;
+            m_expectingCommand = false;
+
+            // Echo to all the other users what we have done. This
+            // will also go to ourselves.
+            Output (cmdinput, String.Empty, false, false, true);
+
+            // If this is a command, we need to resolve and execute it.
             if (isCommand)
             {
+                // This call will actually execute the command and create
+                // any output associated with it. The core just gets an
+                // empty string so it will call again immediately.
                 string[] cmd = Commands.Resolve(Parser.Parse(cmdinput));
 
                 if (cmd.Length != 0)
@@ -151,18 +305,23 @@ namespace OpenSim.Framework.Console
                     return String.Empty;
                 }
             }
+
+            // Return the raw input string if not a command.
             return cmdinput;
         }
 
-        private Hashtable CheckOrigin(Hashtable result)
+        // Very simplistic static access control header.
+        protected Hashtable CheckOrigin(Hashtable result)
         {
             if (!string.IsNullOrEmpty(m_AllowedOrigin))
                 result["access_control_allow_origin"] = m_AllowedOrigin;
+
             return result;
         }
+
         /* TODO: Figure out how PollServiceHTTPHandler can access the request headers
          * in order to use m_AllowedOrigin as a regular expression
-        private Hashtable CheckOrigin(Hashtable headers, Hashtable result)
+        protected Hashtable CheckOrigin(Hashtable headers, Hashtable result)
         {
             if (!string.IsNullOrEmpty(m_AllowedOrigin))
             {
@@ -177,18 +336,23 @@ namespace OpenSim.Framework.Console
         }
         */
 
-        private void DoExpire()
+        protected void DoExpire(Object sender, ElapsedEventArgs e)
         {
+            // Iterate the list of console connections and find those we
+            // haven't heard from for longer then the longpoll interval.
+            // Remove them.
             List<UUID> expired = new List<UUID>();
 
             lock (m_Connections)
             {
+                // Mark the expired ones
                 foreach (KeyValuePair<UUID, ConsoleConnection> kvp in m_Connections)
                 {
                     if (System.Environment.TickCount - kvp.Value.last > 500000)
                         expired.Add(kvp.Key);
                 }
 
+                // Delete them
                 foreach (UUID id in expired)
                 {
                     m_Connections.Remove(id);
@@ -197,10 +361,10 @@ namespace OpenSim.Framework.Console
             }
         }
 
-        private Hashtable HandleHttpStartSession(Hashtable request)
+        // Start a new session.
+        protected Hashtable HandleHttpStartSession(Hashtable request)
         {
-            DoExpire();
-
+            // The login is in the form of a http form post
             Hashtable post = DecodePostString(request["body"].ToString());
             Hashtable reply = new Hashtable();
 
@@ -208,6 +372,7 @@ namespace OpenSim.Framework.Console
             reply["int_response_code"] = 401;
             reply["content_type"] = "text/plain";
 
+            // Check user name and password
             if (m_UserName == String.Empty)
                 return reply;
 
@@ -220,22 +385,28 @@ namespace OpenSim.Framework.Console
                 return reply;
             }
 
+            // Set up the new console connection record
             ConsoleConnection c = new ConsoleConnection();
             c.last = System.Environment.TickCount;
             c.lastLineSeen = 0;
 
+            // Assign session ID
             UUID sessionID = UUID.Random();
 
+            // Add connection to list.
             lock (m_Connections)
             {
                 m_Connections[sessionID] = c;
             }
 
+            // This call is a CAP. The URL is the authentication.
             string uri = "/ReadResponses/" + sessionID.ToString() + "/";
 
             m_Server.AddPollServiceHTTPHandler(
                 uri, new PollServiceEventArgs(null, uri, HasEvents, GetEvents, NoEvents, sessionID,25000)); // 25 secs timeout
 
+            // Our reply is an XML document.
+            // TODO: Change this to Linq.Xml
             XmlDocument xmldoc = new XmlDocument();
             XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
                     "", "");
@@ -252,12 +423,13 @@ namespace OpenSim.Framework.Console
             rootElement.AppendChild(id);
 
             XmlElement prompt = xmldoc.CreateElement("", "Prompt", "");
-            prompt.AppendChild(xmldoc.CreateTextNode(DefaultPrompt));
+            prompt.AppendChild(xmldoc.CreateTextNode(m_lastPromptUsed));
 
             rootElement.AppendChild(prompt);
 
             rootElement.AppendChild(MainConsole.Instance.Commands.GetXml(xmldoc));
 
+            // Set up the response and check origin
             reply["str_response_string"] = xmldoc.InnerXml;
             reply["int_response_code"] = 200;
             reply["content_type"] = "text/xml";
@@ -266,10 +438,9 @@ namespace OpenSim.Framework.Console
             return reply;
         }
 
-        private Hashtable HandleHttpCloseSession(Hashtable request)
+        // Client closes session. Clean up.
+        protected Hashtable HandleHttpCloseSession(Hashtable request)
         {
-            DoExpire();
-
             Hashtable post = DecodePostString(request["body"].ToString());
             Hashtable reply = new Hashtable();
 
@@ -316,10 +487,9 @@ namespace OpenSim.Framework.Console
             return reply;
         }
 
-        private Hashtable HandleHttpSessionCommand(Hashtable request)
+        // Command received from the client.
+        protected Hashtable HandleHttpSessionCommand(Hashtable request)
         {
-            DoExpire();
-
             Hashtable post = DecodePostString(request["body"].ToString());
             Hashtable reply = new Hashtable();
 
@@ -327,6 +497,7 @@ namespace OpenSim.Framework.Console
             reply["int_response_code"] = 404;
             reply["content_type"] = "text/plain";
 
+            // Check the ID
             if (post["ID"] == null)
                 return reply;
 
@@ -334,21 +505,25 @@ namespace OpenSim.Framework.Console
             if (!UUID.TryParse(post["ID"].ToString(), out id))
                 return reply;
 
+            // Find the connection for that ID.
             lock (m_Connections)
             {
                 if (!m_Connections.ContainsKey(id))
                     return reply;
             }
 
+            // Empty post. Just error out.
             if (post["COMMAND"] == null)
                 return reply;
 
+            // Place the input data in the buffer.
             lock (m_InputData)
             {
                 m_DataEvent.Set();
                 m_InputData.Add(post["COMMAND"].ToString());
             }
 
+            // Create the XML reply document.
             XmlDocument xmldoc = new XmlDocument();
             XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
                     "", "");
@@ -372,7 +547,8 @@ namespace OpenSim.Framework.Console
             return reply;
         }
 
-        private Hashtable DecodePostString(string data)
+        // Decode a HTTP form post to a Hashtable
+        protected Hashtable DecodePostString(string data)
         {
             Hashtable result = new Hashtable();
 
@@ -389,13 +565,14 @@ namespace OpenSim.Framework.Console
 
                 if (elems.Length > 1)
                     value = System.Web.HttpUtility.UrlDecode(elems[1]);
-                
+
                 result[name] = value;
             }
 
             return result;
         }
 
+        // Close the CAP receiver for the responses for a given client.
         public void CloseConnection(UUID id)
         {
             try
@@ -409,7 +586,9 @@ namespace OpenSim.Framework.Console
             }
         }
 
-        private bool HasEvents(UUID RequestID, UUID sessionID)
+        // Check if there is anything to send. Return true if this client has
+        // lines pending.
+        protected bool HasEvents(UUID RequestID, UUID sessionID)
         {
             ConsoleConnection c = null;
 
@@ -420,13 +599,15 @@ namespace OpenSim.Framework.Console
                 c = m_Connections[sessionID];
             }
             c.last = System.Environment.TickCount;
-            if (c.lastLineSeen < m_LineNumber)
+            if (c.lastLineSeen < m_lineNumber)
                 return true;
             return false;
         }
 
-        private Hashtable GetEvents(UUID RequestID, UUID sessionID)
+        // Send all pending output to the client.
+        protected Hashtable GetEvents(UUID RequestID, UUID sessionID)
         {
+            // Find the connection that goes with this client.
             ConsoleConnection c = null;
 
             lock (m_Connections)
@@ -435,12 +616,15 @@ namespace OpenSim.Framework.Console
                     return NoEvents(RequestID, UUID.Zero);
                 c = m_Connections[sessionID];
             }
+
+            // If we have nothing to send, send the no events response.
             c.last = System.Environment.TickCount;
-            if (c.lastLineSeen >= m_LineNumber)
+            if (c.lastLineSeen >= m_lineNumber)
                 return NoEvents(RequestID, UUID.Zero);
 
             Hashtable result = new Hashtable();
 
+            // Create the response document.
             XmlDocument xmldoc = new XmlDocument();
             XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
                     "", "");
@@ -449,30 +633,53 @@ namespace OpenSim.Framework.Console
             XmlElement rootElement = xmldoc.CreateElement("", "ConsoleSession",
                     "");
 
-            if (c.newConnection)
-            {
-                c.newConnection = false;
-                Output("+++" + DefaultPrompt);
-            }
+            //if (c.newConnection)
+            //{
+            //    c.newConnection = false;
+            //    Output("+++" + DefaultPrompt);
+            //}
 
             lock (m_Scrollback)
             {
-                long startLine = m_LineNumber - m_Scrollback.Count;
+                long startLine = m_lineNumber - m_Scrollback.Count;
                 long sendStart = startLine;
                 if (sendStart < c.lastLineSeen)
                     sendStart = c.lastLineSeen;
 
-                for (long i = sendStart ; i < m_LineNumber ; i++)
+                for (long i = sendStart ; i < m_lineNumber ; i++)
                 {
+                    ScrollbackEntry e = m_Scrollback[(int)(i - startLine)];
+
                     XmlElement res = xmldoc.CreateElement("", "Line", "");
-                    long line = i + 1;
-                    res.SetAttribute("Number", line.ToString());
-                    res.AppendChild(xmldoc.CreateTextNode(m_Scrollback[(int)(i - startLine)]));
+                    res.SetAttribute("Number", e.lineNumber.ToString());
+                    res.SetAttribute("Level", e.level);
+                    // Don't include these for the scrollback, we'll send the
+                    // real state later.
+                    if (!c.newConnection)
+                    {
+                        res.SetAttribute("Prompt", e.isPrompt ? "true" : "false");
+                        res.SetAttribute("Command", e.isCommand ? "true" : "false");
+                        res.SetAttribute("Input", e.isInput ? "true" : "false");
+                    }
+                    else if (i == m_lineNumber - 1) // Last line for a new connection
+                    {
+                        res.SetAttribute("Prompt", m_expectingInput ? "true" : "false");
+                        res.SetAttribute("Command", m_expectingCommand ? "true" : "false");
+                        res.SetAttribute("Input", (!m_expectingInput) ? "true" : "false");
+                    }
+                    else
+                    {
+                        res.SetAttribute("Input", e.isInput ? "true" : "false");
+                    }
+
+                    res.AppendChild(xmldoc.CreateTextNode(e.text));
 
                     rootElement.AppendChild(res);
                 }
             }
-            c.lastLineSeen = m_LineNumber;
+
+            c.lastLineSeen = m_lineNumber;
+            c.newConnection = false;
 
             xmldoc.AppendChild(rootElement);
 
@@ -486,7 +693,9 @@ namespace OpenSim.Framework.Console
             return result;
         }
 
-        private Hashtable NoEvents(UUID RequestID, UUID id)
+        // This is really just a no-op. It generates what is sent
+        // to the client if the poll times out without any events.
+        protected Hashtable NoEvents(UUID RequestID, UUID id)
         {
             Hashtable result = new Hashtable();