diff options
author | Diva Canto | 2010-01-10 16:20:59 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-10 16:20:59 -0800 |
commit | 53e83e5dbb3590cb9c858aa301665357d1511b30 (patch) | |
tree | 732c828f49c3c54dc49bcd6eec86153ab76bc8ae /OpenSim/Grid/UserServer | |
parent | Some typos fixed related to master avie removal (diff) | |
download | opensim-SC-53e83e5dbb3590cb9c858aa301665357d1511b30.zip opensim-SC-53e83e5dbb3590cb9c858aa301665357d1511b30.tar.gz opensim-SC-53e83e5dbb3590cb9c858aa301665357d1511b30.tar.bz2 opensim-SC-53e83e5dbb3590cb9c858aa301665357d1511b30.tar.xz |
* Starting to clean the house...
* Fixed circular dependency
Diffstat (limited to 'OpenSim/Grid/UserServer')
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 286076d7..5bf728a 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -64,7 +64,6 @@ namespace OpenSim.Grid.UserServer | |||
64 | protected UserServerFriendsModule m_friendsModule; | 64 | protected UserServerFriendsModule m_friendsModule; |
65 | 65 | ||
66 | public UserLoginService m_loginService; | 66 | public UserLoginService m_loginService; |
67 | public UserLoginAuthService m_loginAuthService; | ||
68 | public MessageServersConnector m_messagesService; | 67 | public MessageServersConnector m_messagesService; |
69 | 68 | ||
70 | protected GridInfoServiceModule m_gridInfoService; | 69 | protected GridInfoServiceModule m_gridInfoService; |
@@ -245,9 +244,6 @@ namespace OpenSim.Grid.UserServer | |||
245 | m_loginService = new UserLoginService( | 244 | m_loginService = new UserLoginService( |
246 | m_userDataBaseService, inventoryService, new LibraryRootFolder(Cfg.LibraryXmlfile), Cfg, Cfg.DefaultStartupMsg, new RegionProfileServiceProxy()); | 245 | m_userDataBaseService, inventoryService, new LibraryRootFolder(Cfg.LibraryXmlfile), Cfg, Cfg.DefaultStartupMsg, new RegionProfileServiceProxy()); |
247 | 246 | ||
248 | if (Cfg.EnableHGLogin) | ||
249 | m_loginAuthService = new UserLoginAuthService(m_userDataBaseService, inventoryService, new LibraryRootFolder(Cfg.LibraryXmlfile), | ||
250 | Cfg, Cfg.DefaultStartupMsg, new RegionProfileServiceProxy()); | ||
251 | } | 247 | } |
252 | 248 | ||
253 | protected virtual void PostInitialiseModules() | 249 | protected virtual void PostInitialiseModules() |
@@ -266,9 +262,6 @@ namespace OpenSim.Grid.UserServer | |||
266 | { | 262 | { |
267 | m_loginService.RegisterHandlers(m_httpServer, Cfg.EnableLLSDLogin, true); | 263 | m_loginService.RegisterHandlers(m_httpServer, Cfg.EnableLLSDLogin, true); |
268 | 264 | ||
269 | if (m_loginAuthService != null) | ||
270 | m_loginAuthService.RegisterHandlers(m_httpServer); | ||
271 | |||
272 | m_userManager.RegisterHandlers(m_httpServer); | 265 | m_userManager.RegisterHandlers(m_httpServer); |
273 | m_friendsModule.RegisterHandlers(m_httpServer); | 266 | m_friendsModule.RegisterHandlers(m_httpServer); |
274 | m_avatarAppearanceModule.RegisterHandlers(m_httpServer); | 267 | m_avatarAppearanceModule.RegisterHandlers(m_httpServer); |