diff options
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 :)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Client/Linden/LLStandaloneLoginService.cs | 5 |
1 files changed, 3 insertions, 2 deletions
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; | |||
42 | using OpenSim.Framework.Servers; | 42 | using OpenSim.Framework.Servers; |
43 | using OpenSim.Region.Framework.Scenes; | 43 | using OpenSim.Region.Framework.Scenes; |
44 | using OpenSim.Region.Framework.Interfaces; | 44 | using OpenSim.Region.Framework.Interfaces; |
45 | using OpenSim.Services.Interfaces; | ||
45 | 46 | ||
46 | namespace OpenSim.Client.Linden | 47 | namespace OpenSim.Client.Linden |
47 | { | 48 | { |
@@ -59,7 +60,7 @@ namespace OpenSim.Client.Linden | |||
59 | 60 | ||
60 | public LLStandaloneLoginService( | 61 | public LLStandaloneLoginService( |
61 | UserManagerBase userManager, string welcomeMess, | 62 | UserManagerBase userManager, string welcomeMess, |
62 | IInterServiceInventoryServices interServiceInventoryService, | 63 | IInventoryService interServiceInventoryService, |
63 | NetworkServersInfo serversInfo, | 64 | NetworkServersInfo serversInfo, |
64 | bool authenticate, LibraryRootFolder libraryRootFolder, ILoginServiceToRegionsConnector regionsConnector) | 65 | bool authenticate, LibraryRootFolder libraryRootFolder, ILoginServiceToRegionsConnector regionsConnector) |
65 | : base(userManager, libraryRootFolder, welcomeMess) | 66 | : base(userManager, libraryRootFolder, welcomeMess) |
@@ -69,7 +70,7 @@ namespace OpenSim.Client.Linden | |||
69 | m_defaultHomeY = this.m_serversInfo.DefaultHomeLocY; | 70 | m_defaultHomeY = this.m_serversInfo.DefaultHomeLocY; |
70 | m_authUsers = authenticate; | 71 | m_authUsers = authenticate; |
71 | 72 | ||
72 | m_inventoryService = interServiceInventoryService; | 73 | m_InventoryService = interServiceInventoryService; |
73 | m_regionsConnector = regionsConnector; | 74 | m_regionsConnector = regionsConnector; |
74 | // Standard behavior: In StandAlone, silent logout of last hung session | 75 | // Standard behavior: In StandAlone, silent logout of last hung session |
75 | m_warn_already_logged = false; | 76 | m_warn_already_logged = false; |