aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs2
-rw-r--r--OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs4
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs
index f4ebc70..6f2371d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication
99 if (!m_Registered) 99 if (!m_Registered)
100 { 100 {
101 m_Registered = true; 101 m_Registered = true;
102 new HGAuthServiceInConnector(m_Config, MainServer.Instance); 102 new HGAuthServiceInConnector(m_Config, MainServer.Instance, scene);
103 103
104 //Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer }; 104 //Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer };
105 //ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Server.Handlers.dll:HGAuthServiceInConnector", args); 105 //ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Server.Handlers.dll:HGAuthServiceInConnector", args);
diff --git a/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs b/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs
index 2d31564..f4f8309 100644
--- a/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs
+++ b/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using Nini.Config; 29using Nini.Config;
30using OpenSim.Framework;
30using OpenSim.Server.Base; 31using OpenSim.Server.Base;
31using OpenSim.Services.Interfaces; 32using OpenSim.Services.Interfaces;
32using OpenSim.Framework.Servers.HttpServer; 33using OpenSim.Framework.Servers.HttpServer;
@@ -38,7 +39,7 @@ namespace OpenSim.Server.Handlers.Authentication
38 { 39 {
39 private IAuthenticationService m_AuthenticationService; 40 private IAuthenticationService m_AuthenticationService;
40 41
41 public HGAuthServiceInConnector(IConfigSource config, IHttpServer server) : 42 public HGAuthServiceInConnector(IConfigSource config, IHttpServer server, IScene registry) :
42 base(config, server) 43 base(config, server)
43 { 44 {
44 IConfig serverConfig = config.Configs["AuthenticationService"]; 45 IConfig serverConfig = config.Configs["AuthenticationService"];
@@ -53,6 +54,7 @@ namespace OpenSim.Server.Handlers.Authentication
53 54
54 Object[] args = new Object[] { config }; 55 Object[] args = new Object[] { config };
55 m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args); 56 m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args);
57 registry.RegisterModuleInterface<IAuthenticationService>(m_AuthenticationService);
56 58
57 HGAuthenticationHandlers m_handlers = new HGAuthenticationHandlers(m_AuthenticationService); 59 HGAuthenticationHandlers m_handlers = new HGAuthenticationHandlers(m_AuthenticationService);
58 server.AddXmlRPCHandler("hg_new_auth_key", m_handlers.GenerateKeyMethod); 60 server.AddXmlRPCHandler("hg_new_auth_key", m_handlers.GenerateKeyMethod);