diff options
author | Justin Clarke Casey | 2009-03-19 18:11:44 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-03-19 18:11:44 +0000 |
commit | bd2180d9af21dd54d4199a9381afa3e43e913823 (patch) | |
tree | 7f82f0dd30e24d8eaa4f8cbb2493cb2f3f1c637f /OpenSim/Client | |
parent | * Lock http handlers dictionary in other places as well to avoid race conditions (diff) | |
download | opensim-SC-bd2180d9af21dd54d4199a9381afa3e43e913823.zip opensim-SC-bd2180d9af21dd54d4199a9381afa3e43e913823.tar.gz opensim-SC-bd2180d9af21dd54d4199a9381afa3e43e913823.tar.bz2 opensim-SC-bd2180d9af21dd54d4199a9381afa3e43e913823.tar.xz |
* refactor: Create IHttpServer interface instead of accessing BaseHttpServer via CommunicationsManager directly
Diffstat (limited to 'OpenSim/Client')
-rw-r--r-- | OpenSim/Client/Linden/LLStandaloneLoginModule.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs index 11bb2c4..00407fd 100644 --- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs +++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs | |||
@@ -38,7 +38,7 @@ using OpenSim.Framework; | |||
38 | using OpenSim.Framework.Communications; | 38 | using OpenSim.Framework.Communications; |
39 | using OpenSim.Framework.Communications.Cache; | 39 | using OpenSim.Framework.Communications.Cache; |
40 | using OpenSim.Framework.Communications.Capabilities; | 40 | using OpenSim.Framework.Communications.Capabilities; |
41 | using OpenSim.Framework.Servers; | 41 | using OpenSim.Framework.Servers.Interfaces; |
42 | using OpenSim.Region.Framework.Scenes; | 42 | using OpenSim.Region.Framework.Scenes; |
43 | using OpenSim.Region.Framework.Interfaces; | 43 | using OpenSim.Region.Framework.Interfaces; |
44 | 44 | ||
@@ -97,9 +97,10 @@ namespace OpenSim.Client.Linden | |||
97 | } | 97 | } |
98 | 98 | ||
99 | //TODO: fix casting. | 99 | //TODO: fix casting. |
100 | LibraryRootFolder rootFolder = m_firstScene.CommsManager.UserProfileCacheService.LibraryRoot as LibraryRootFolder; | 100 | LibraryRootFolder rootFolder |
101 | = m_firstScene.CommsManager.UserProfileCacheService.LibraryRoot as LibraryRootFolder; | ||
101 | 102 | ||
102 | BaseHttpServer httpServer = m_firstScene.CommsManager.HttpServer; | 103 | IHttpServer httpServer = m_firstScene.CommsManager.HttpServer; |
103 | 104 | ||
104 | //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference | 105 | //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference |
105 | m_loginService = new LLStandaloneLoginService((UserManagerBase)m_firstScene.CommsManager.UserService, welcomeMessage, m_firstScene.CommsManager.InterServiceInventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, rootFolder, this); | 106 | m_loginService = new LLStandaloneLoginService((UserManagerBase)m_firstScene.CommsManager.UserService, welcomeMessage, m_firstScene.CommsManager.InterServiceInventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, rootFolder, this); |