1 files changed, 37 insertions, 41 deletions

diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index e6e18d4..bf793bf 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -44,42 +44,9 @@ namespace OpenSim.Grid.MessagingServer
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private MessageServerConfig Cfg;
-
-        private LLUUID m_lastCreatedUser = LLUUID.Random();
         private MessageService msgsvc;
-
-        private OpenMessage_Main()
-        {
-            m_console = new ConsoleBase("OpenMessage", this);
-            MainConsole.Instance = m_console;
-        }
-
-        #region conscmd_callback Members
-
-        public override void RunCmd(string cmd, string[] cmdparams)
-        {
-            base.RunCmd(cmd, cmdparams);
-
-            switch (cmd)
-            {
-                case "help":
-                    m_console.Notice("shutdown - shutdown the message server (USE CAUTION!)");
-                    break;
-
-                case "shutdown":
-                    msgsvc.deregisterWithUserServer();
-                    m_console.Close();
-                    Environment.Exit(0);
-                    break;
-            }
-        }
-
-        public override void Show(string ShowWhat)
-        {
-            base.Show(ShowWhat);
-        }
-
-        #endregion
+        
+        private LLUUID m_lastCreatedUser = LLUUID.Random();
 
         [STAThread]
         public static void Main(string[] args)
@@ -88,6 +55,7 @@ namespace OpenSim.Grid.MessagingServer
 
             m_log.Info("Launching MessagingServer...");
 
+            
 
             OpenMessage_Main messageserver = new OpenMessage_Main();
 
@@ -95,6 +63,12 @@ namespace OpenSim.Grid.MessagingServer
             messageserver.Work();
         }
 
+        private OpenMessage_Main()
+        {
+            m_console = new ConsoleBase("OpenMessage", this);
+            MainConsole.Instance = m_console;
+        }
+
         private void Work()
         {
             m_console.Notice("Enter help for a list of commands\n");
@@ -144,13 +118,12 @@ namespace OpenSim.Grid.MessagingServer
             switch (what)
             {
                 case "user":
-
+                    
                     try
                     {
                         //userID =
-                        //m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY);
-                    }
-                    catch (Exception ex)
+                            //m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY);
+                    } catch (Exception ex)
                     {
                         m_console.Error("[SERVER]: Error creating user: {0}", ex.ToString());
                     }
@@ -158,7 +131,7 @@ namespace OpenSim.Grid.MessagingServer
                     try
                     {
                         //RestObjectPoster.BeginPostObject<Guid>(m_userManager._config.InventoryUrl + "CreateInventory/",
-                        //userID.UUID);
+                                                               //userID.UUID);
                     }
                     catch (Exception ex)
                     {
@@ -168,5 +141,28 @@ namespace OpenSim.Grid.MessagingServer
                     break;
             }
         }
+
+        public override void RunCmd(string cmd, string[] cmdparams)
+        {
+            base.RunCmd(cmd, cmdparams);
+            
+            switch (cmd)
+            {
+                case "help":
+                    m_console.Notice("shutdown - shutdown the message server (USE CAUTION!)");
+                    break;
+
+                case "shutdown":
+                    msgsvc.deregisterWithUserServer();
+                    m_console.Close();
+                    Environment.Exit(0);
+                    break;
+            }
+        }
+
+        public override void Show(string ShowWhat)
+        {
+            base.Show(ShowWhat);
+        }
     }
-}
\ No newline at end of file
+}