Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

author: Melanie 2009-08-07 03:05:46 +0100
committer: Melanie 2009-08-07 03:05:46 +0100
commit: e49abf446aff77fb809a0222ad0adaf4b37f3cf9 (patch)
tree: 140251676b090bed41af22f87b804a6bd8bcf540 /OpenSim/Region/CoreModules
parent: Revert the XEngine memleak patch, it causes premature GC. (diff)
parent: HGAuthenticationService must be a singleton, because it has in-memory state. ... (diff)
download: opensim-SC_OLD-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.zip
opensim-SC_OLD-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.gz
opensim-SC_OLD-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.bz2
opensim-SC_OLD-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.xz
1 files changed, 1 insertions, 1 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
            if (!m_Registered)
            {
                m_Registered = true;
-                new HGAuthServiceInConnector(m_Config, MainServer.Instance);
+                new HGAuthServiceInConnector(m_Config, MainServer.Instance, scene);
                //Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer };
                //ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Server.Handlers.dll:HGAuthServiceInConnector", args);
author	Melanie	2009-08-07 03:05:46 +0100
committer	Melanie	2009-08-07 03:05:46 +0100
commit	e49abf446aff77fb809a0222ad0adaf4b37f3cf9 (patch)
tree	140251676b090bed41af22f87b804a6bd8bcf540 /OpenSim/Region/CoreModules
parent	Revert the XEngine memleak patch, it causes premature GC. (diff)
parent	HGAuthenticationService must be a singleton, because it has in-memory state. ... (diff)
download	opensim-SC_OLD-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.zip opensim-SC_OLD-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.gz opensim-SC_OLD-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.bz2 opensim-SC_OLD-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.xz

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);