From 156604e28e51d0a7e0c8018ce10eb517a9123ce4 Mon Sep 17 00:00:00 2001
From: diva
Date: Thu, 11 Jun 2009 03:00:25 +0000
Subject: InterServiceInventoryService references *almost* completely removed
 from the simulator. Only a couple left, not important. Also updated the login
 tests -- Justin, this time I was able to fix this by myself :)

---
 OpenSim/Client/Linden/LLStandaloneLoginModule.cs  | 2 +-
 OpenSim/Client/Linden/LLStandaloneLoginService.cs | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Client')

diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
index 6474feb..bfafdc3 100644
--- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
+++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
@@ -111,7 +111,7 @@ 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.CommsManager.InterServiceInventoryService, 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);
 
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginService.cs b/OpenSim/Client/Linden/LLStandaloneLoginService.cs
index 6b217e6..c2de348 100644
--- a/OpenSim/Client/Linden/LLStandaloneLoginService.cs
+++ b/OpenSim/Client/Linden/LLStandaloneLoginService.cs
@@ -42,6 +42,7 @@ using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Client.Linden
 {
@@ -59,7 +60,7 @@ namespace OpenSim.Client.Linden
 
         public LLStandaloneLoginService(
             UserManagerBase userManager, string welcomeMess,
-            IInterServiceInventoryServices interServiceInventoryService,
+            IInventoryService interServiceInventoryService,
             NetworkServersInfo serversInfo,
             bool authenticate, LibraryRootFolder libraryRootFolder, ILoginServiceToRegionsConnector regionsConnector)
             : base(userManager, libraryRootFolder, welcomeMess)
@@ -69,7 +70,7 @@ namespace OpenSim.Client.Linden
             m_defaultHomeY = this.m_serversInfo.DefaultHomeLocY;
             m_authUsers = authenticate;
 
-            m_inventoryService = interServiceInventoryService;
+            m_InventoryService = interServiceInventoryService;
             m_regionsConnector = regionsConnector;
             // Standard behavior: In StandAlone, silent logout of last hung session
             m_warn_already_logged = false;
-- 
cgit v1.1