aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers
diff options
context:
space:
mode:
authorMelanie2009-08-07 03:05:46 +0100
committerMelanie2009-08-07 03:05:46 +0100
commite49abf446aff77fb809a0222ad0adaf4b37f3cf9 (patch)
tree140251676b090bed41af22f87b804a6bd8bcf540 /OpenSim/Server/Handlers
parentRevert the XEngine memleak patch, it causes premature GC. (diff)
parentHGAuthenticationService must be a singleton, because it has in-memory state. ... (diff)
downloadopensim-SC-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.zip
opensim-SC-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.gz
opensim-SC-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.bz2
opensim-SC-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.xz
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r--OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs4
1 files changed, 3 insertions, 1 deletions
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);