Refactor. Make ConsoleBase a true base class. Create CommandConsole as a simple

console capable of processing commands. Create LocalConsole as a console
that uses cursor control and context help. Precursor to a distributed
console system for the new grid services. No functional change intended :)

2 files changed, 6 insertions, 6 deletions

diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 0a5abd3..d9185cb 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Grid.UserServer
 
         public OpenUser_Main()
         {
-            m_console = new ConsoleBase("User");
+            m_console = new LocalConsole("User");
             MainConsole.Instance = m_console;
         }
 
@@ -126,7 +126,7 @@ namespace OpenSim.Grid.UserServer
 
             m_httpServer = new BaseHttpServer(Cfg.HttpPort);
 
-            RegisterInterface<ConsoleBase>(m_console);
+            RegisterInterface<CommandConsole>(m_console);
             RegisterInterface<UserConfig>(Cfg);
 
             //Should be in modules?
diff --git a/OpenSim/Grid/UserServer/UserServerCommandModule.cs b/OpenSim/Grid/UserServer/UserServerCommandModule.cs
index f73b3de..1d74c80 100644
--- a/OpenSim/Grid/UserServer/UserServerCommandModule.cs
+++ b/OpenSim/Grid/UserServer/UserServerCommandModule.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Grid.UserServer
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected ConsoleBase m_console;
+        protected CommandConsole m_console;
         protected UserConfig m_cfg;
 
         protected UserDataBaseService m_userDataBaseService;
@@ -88,8 +88,8 @@ namespace OpenSim.Grid.UserServer
                 m_loginService = loginService;
             }
 
-            ConsoleBase console;
-            if ((m_core.TryGet<ConsoleBase>(out console)) && (m_cfg != null)
+            CommandConsole console;
+            if ((m_core.TryGet<CommandConsole>(out console)) && (m_cfg != null)
                 && (m_userDataBaseService != null) && (m_loginService != null))
             {
                 RegisterConsoleCommands(console);
@@ -101,7 +101,7 @@ namespace OpenSim.Grid.UserServer
 
         }
 
-        private void RegisterConsoleCommands(ConsoleBase console)
+        private void RegisterConsoleCommands(CommandConsole console)
         {
             m_console = console;
             m_console.Commands.AddCommand("userserver", false, "create user",