* 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

2 files changed, 34 insertions, 28 deletions

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"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs
index 69a37a9..bc833c3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
                     //}
 
                     m_Enabled = true;
-                    m_log.Info("[INVENTORY CONNECTOR]: Local asset connector enabled");
+                    m_log.Info("[INVENTORY CONNECTOR]: Local inventory connector enabled");
                 }
             }
         }
@@ -120,6 +120,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
 
         public void AddRegion(Scene scene)
         {
+            m_log.DebugFormat("HEEEERE");
             if (!m_Enabled)
                 return;
 
@@ -131,8 +132,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
                 m_Initialized = true;
             }
 
+            m_log.DebugFormat(
+                "[INVENTORY CONNECTOR]: Registering IInventoryService to scene {0}", scene.RegionInfo.RegionName);
+            
             scene.RegisterModuleInterface<IInventoryService>(this);
-
         }
 
         public void RemoveRegion(Scene scene)
@@ -144,8 +147,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
             if (!m_Enabled)
                 return;
 
-            m_log.InfoFormat("[INVENTORY CONNECTOR]: Enabled local assets for region {0}", scene.RegionInfo.RegionName);
-
+            m_log.InfoFormat(
+                "[INVENTORY CONNECTOR]: Enabled local invnetory for region {0}", scene.RegionInfo.RegionName);
         }
 
         #region IInventoryService