More refactoring of the Grid, User and Messaging servers.

1 files changed, 10 insertions, 4 deletions

diff --git a/OpenSim/Grid/UserServer/UserServerCommandModule.cs b/OpenSim/Grid/UserServer/UserServerCommandModule.cs
index f35cfec..a6f8af2 100644
--- a/OpenSim/Grid/UserServer/UserServerCommandModule.cs
+++ b/OpenSim/Grid/UserServer/UserServerCommandModule.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -59,9 +59,8 @@ namespace OpenSim.Grid.UserServer
 
         protected IUGAIMCore m_core;
 
-        public UserServerCommandModule( UserLoginService loginService)
+        public UserServerCommandModule()
         {
-            m_loginService = loginService;
         }
 
         public void Initialise(IUGAIMCore core)
@@ -83,8 +82,15 @@ namespace OpenSim.Grid.UserServer
                 m_userDataBaseService = userDBservice;
             }
 
+            UserLoginService loginService;
+            if (m_core.TryGet<UserLoginService>(out loginService))
+            {
+                m_loginService = loginService;
+            }
+
             ConsoleBase console;
-            if ((m_core.TryGet<ConsoleBase>(out console)) && (m_cfg != null) && (m_userDataBaseService != null))
+            if ((m_core.TryGet<ConsoleBase>(out console)) && (m_cfg != null)
+                && (m_userDataBaseService != null) && (m_loginService != null))
             {
                 RegisterConsoleCommands(console);
             }