aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
diff options
context:
space:
mode:
authordiva2009-03-27 16:23:52 +0000
committerdiva2009-03-27 16:23:52 +0000
commit6b9125b31944c126fa9bf25529a27de5c3972244 (patch)
tree45ad9a9480dffab1bfe357afed744365e13ad665 /OpenSim/Grid/UserServer
parentsvn:eol-style property set. (diff)
downloadopensim-SC-6b9125b31944c126fa9bf25529a27de5c3972244.zip
opensim-SC-6b9125b31944c126fa9bf25529a27de5c3972244.tar.gz
opensim-SC-6b9125b31944c126fa9bf25529a27de5c3972244.tar.bz2
opensim-SC-6b9125b31944c126fa9bf25529a27de5c3972244.tar.xz
Added the hg login procedure to the user server.
Diffstat (limited to 'OpenSim/Grid/UserServer')
-rw-r--r--OpenSim/Grid/UserServer/Main.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 5a1dfd1..c0cba4a 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -62,6 +62,7 @@ namespace OpenSim.Grid.UserServer
62 protected UserServerFriendsModule m_friendsModule; 62 protected UserServerFriendsModule m_friendsModule;
63 63
64 public UserLoginService m_loginService; 64 public UserLoginService m_loginService;
65 public UserLoginAuthService m_loginAuthService;
65 public MessageServersConnector m_messagesService; 66 public MessageServersConnector m_messagesService;
66 67
67 protected GridInfoServiceModule m_gridInfoService; 68 protected GridInfoServiceModule m_gridInfoService;
@@ -191,6 +192,10 @@ namespace OpenSim.Grid.UserServer
191 { 192 {
192 m_loginService = new UserLoginService( 193 m_loginService = new UserLoginService(
193 m_userDataBaseService, inventoryService, new LibraryRootFolder(Cfg.LibraryXmlfile), Cfg, Cfg.DefaultStartupMsg, new RegionProfileServiceProxy()); 194 m_userDataBaseService, inventoryService, new LibraryRootFolder(Cfg.LibraryXmlfile), Cfg, Cfg.DefaultStartupMsg, new RegionProfileServiceProxy());
195
196 if (Cfg.EnableHGLogin)
197 m_loginAuthService = new UserLoginAuthService(m_userDataBaseService, inventoryService, new LibraryRootFolder(Cfg.LibraryXmlfile),
198 Cfg, Cfg.DefaultStartupMsg, new RegionProfileServiceProxy());
194 } 199 }
195 200
196 protected virtual void PostInitialiseModules() 201 protected virtual void PostInitialiseModules()
@@ -209,6 +214,9 @@ namespace OpenSim.Grid.UserServer
209 { 214 {
210 m_loginService.RegisterHandlers(m_httpServer, Cfg.EnableLLSDLogin, true); 215 m_loginService.RegisterHandlers(m_httpServer, Cfg.EnableLLSDLogin, true);
211 216
217 if (m_loginAuthService != null)
218 m_loginAuthService.RegisterHandlers(m_httpServer);
219
212 m_userManager.RegisterHandlers(m_httpServer); 220 m_userManager.RegisterHandlers(m_httpServer);
213 m_friendsModule.RegisterHandlers(m_httpServer); 221 m_friendsModule.RegisterHandlers(m_httpServer);
214 m_avatarAppearanceModule.RegisterHandlers(m_httpServer); 222 m_avatarAppearanceModule.RegisterHandlers(m_httpServer);