diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs index c458b89..2c7ba93 100644 --- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs +++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs | |||
@@ -54,7 +54,6 @@ namespace OpenSim.Region.CoreModules.Hypergrid | |||
54 | 54 | ||
55 | protected bool m_enabled = false; // Module is only enabled if running in standalone mode | 55 | protected bool m_enabled = false; // Module is only enabled if running in standalone mode |
56 | 56 | ||
57 | |||
58 | public bool RegionLoginsEnabled | 57 | public bool RegionLoginsEnabled |
59 | { | 58 | { |
60 | get | 59 | get |
@@ -88,7 +87,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid | |||
88 | 87 | ||
89 | if (m_enabled) | 88 | if (m_enabled) |
90 | { | 89 | { |
91 | m_log.Debug("[HGLogin] HGlogin module enabled"); | 90 | m_log.Debug("[HGLogin]: HGlogin module enabled"); |
92 | bool authenticate = true; | 91 | bool authenticate = true; |
93 | string welcomeMessage = "Welcome to OpenSim"; | 92 | string welcomeMessage = "Welcome to OpenSim"; |
94 | IConfig standaloneConfig = source.Configs["StandAlone"]; | 93 | IConfig standaloneConfig = source.Configs["StandAlone"]; |
@@ -104,7 +103,15 @@ namespace OpenSim.Region.CoreModules.Hypergrid | |||
104 | IHttpServer httpServer = m_firstScene.CommsManager.HttpServer; | 103 | IHttpServer httpServer = m_firstScene.CommsManager.HttpServer; |
105 | 104 | ||
106 | //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 |
107 | m_loginService = new HGLoginAuthService((UserManagerBase)m_firstScene.CommsManager.UserAdminService, welcomeMessage, m_firstScene.CommsManager.InterServiceInventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, rootFolder, this); | 106 | m_loginService |
107 | = new HGLoginAuthService( | ||
108 | (UserManagerBase)m_firstScene.CommsManager.UserAdminService, | ||
109 | welcomeMessage, | ||
110 | m_firstScene.CommsManager.InterServiceInventoryService, | ||
111 | m_firstScene.CommsManager.NetworkServersInfo, | ||
112 | authenticate, | ||
113 | rootFolder, | ||
114 | this); | ||
108 | 115 | ||
109 | httpServer.AddXmlRPCHandler("hg_login", m_loginService.XmlRpcLoginMethod); | 116 | httpServer.AddXmlRPCHandler("hg_login", m_loginService.XmlRpcLoginMethod); |
110 | httpServer.AddXmlRPCHandler("hg_new_auth_key", m_loginService.XmlRpcGenerateKeyMethod); | 117 | httpServer.AddXmlRPCHandler("hg_new_auth_key", m_loginService.XmlRpcGenerateKeyMethod); |