diff options
author | diva | 2009-06-11 03:00:25 +0000 |
---|---|---|
committer | diva | 2009-06-11 03:00:25 +0000 |
commit | 156604e28e51d0a7e0c8018ce10eb517a9123ce4 (patch) | |
tree | 5274ef45eb20c76d80c4b1157ee659e3497e5b67 /OpenSim/Client | |
parent | Removed a change in StandaloneHypergrid.ini introduced in r9838, which was in... (diff) | |
download | opensim-SC_OLD-156604e28e51d0a7e0c8018ce10eb517a9123ce4.zip opensim-SC_OLD-156604e28e51d0a7e0c8018ce10eb517a9123ce4.tar.gz opensim-SC_OLD-156604e28e51d0a7e0c8018ce10eb517a9123ce4.tar.bz2 opensim-SC_OLD-156604e28e51d0a7e0c8018ce10eb517a9123ce4.tar.xz |
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/LLStandaloneLoginModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Client/Linden/LLStandaloneLoginService.cs | 5 |
2 files changed, 4 insertions, 3 deletions
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 | |||
111 | IHttpServer httpServer = m_firstScene.CommsManager.HttpServer; | 111 | IHttpServer httpServer = m_firstScene.CommsManager.HttpServer; |
112 | 112 | ||
113 | //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference | 113 | //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference |
114 | m_loginService = new LLStandaloneLoginService((UserManagerBase)m_firstScene.CommsManager.UserAdminService, welcomeMessage, m_firstScene.CommsManager.InterServiceInventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, rootFolder, this); | 114 | m_loginService = new LLStandaloneLoginService((UserManagerBase)m_firstScene.CommsManager.UserAdminService, welcomeMessage, m_firstScene.InventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, rootFolder, this); |
115 | 115 | ||
116 | httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); | 116 | httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); |
117 | 117 | ||
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; |