From 45342067f5f5d5f6ca86f9ed179f275ed6131fea Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 12 Jun 2009 15:41:53 +0000
Subject: * Move standalone login setup in LLStandaloneLoginmodule to
 RegionLoaded() from AddRegion() * This is necessary to avoid a dependency
 problem where LLStandaloneLoginModule references IInventoryService before the
 LocalInventoryServiceConnector is registered * Correct some copypasta log
 messages in LocalInventoryServiceConnector

---
 OpenSim/Client/Linden/LLStandaloneLoginModule.cs | 51 +++++++++++++-----------
 1 file changed, 27 insertions(+), 24 deletions(-)

(limited to 'OpenSim/Client/Linden')

diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
index bfafdc3..cc5f5ff 100644
--- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
+++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
@@ -98,6 +98,28 @@ namespace OpenSim.Client.Linden
 
         public void AddRegion(Scene scene)
         {
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (m_enabled)
+            {
+                RemoveScene(scene);
+            }
+        }
+
+        public void PostInitialise()
+        {
+
+        }
+
+        public void Close()
+        {
+
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
             if (m_firstScene == null)
             {
                 m_firstScene = scene;
@@ -111,7 +133,11 @@ namespace OpenSim.Client.Linden
                     IHttpServer httpServer = m_firstScene.CommsManager.HttpServer;
 
                     //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference
-                    m_loginService = new LLStandaloneLoginService((UserManagerBase)m_firstScene.CommsManager.UserAdminService, welcomeMessage, m_firstScene.InventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, rootFolder, this);
+                    m_loginService 
+                        = new LLStandaloneLoginService(
+                            (UserManagerBase)m_firstScene.CommsManager.UserAdminService, welcomeMessage, 
+                            m_firstScene.InventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, 
+                            rootFolder, this);
 
                     httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod);
 
@@ -129,29 +155,6 @@ namespace OpenSim.Client.Linden
             }
         }
 
-        public void RemoveRegion(Scene scene)
-        {
-            if (m_enabled)
-            {
-                RemoveScene(scene);
-            }
-        }
-
-        public void PostInitialise()
-        {
-
-        }
-
-        public void Close()
-        {
-
-        }
-
-        public void RegionLoaded(Scene scene)
-        {
-
-        }
-
         public string Name
         {
             get { return "LLStandaloneLoginModule"; }
-- 
cgit v1.1