1 files changed, 53 insertions, 50 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index c5cfe75..3fc9327 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -49,61 +49,64 @@ namespace OpenSim.Services.HypergridService
                LogManager.GetLogger(
                MethodBase.GetCurrentMethod().DeclaringType);
-        IGridService m_GridService;
+        private static bool m_Initialized = false;
-        IPresenceService m_PresenceService;
-        IUserAccountService m_UserAccountService;
-        IUserAgentService m_UserAgentService;
-        ISimulationService m_SimulationService;
-        string m_AuthDll;
+        private static IGridService m_GridService;
+        private static IPresenceService m_PresenceService;
+        private static IUserAccountService m_UserAccountService;
+        private static IUserAgentService m_UserAgentService;
+        private static ISimulationService m_SimulationService;
-        UUID m_ScopeID;
+        private static UUID m_ScopeID;
-        bool m_AllowTeleportsToAnyRegion;
+        private static bool m_AllowTeleportsToAnyRegion;
-        string m_ExternalName;
+        private static string m_ExternalName;
-        GridRegion m_DefaultGatewayRegion;
+        private static GridRegion m_DefaultGatewayRegion;
        public GatekeeperService(IConfigSource config, ISimulationService simService)
        {
-            IConfig serverConfig = config.Configs["GatekeeperService"];
+            if (!m_Initialized)
-            if (serverConfig == null)
+            {
-                throw new Exception(String.Format("No section GatekeeperService in config file"));
+                m_Initialized = true;
-            string accountService = serverConfig.GetString("UserAccountService", String.Empty);
+                IConfig serverConfig = config.Configs["GatekeeperService"];
-            string homeUsersService = serverConfig.GetString("HomeUsersSecurityService", string.Empty);
+                if (serverConfig == null)
-            string gridService = serverConfig.GetString("GridService", String.Empty);
+                    throw new Exception(String.Format("No section GatekeeperService in config file"));
-            string presenceService = serverConfig.GetString("PresenceService", String.Empty);
-            string simulationService = serverConfig.GetString("SimulationService", String.Empty);
+                string accountService = serverConfig.GetString("UserAccountService", String.Empty);
+                string homeUsersService = serverConfig.GetString("HomeUsersSecurityService", string.Empty);
-            //m_AuthDll = serverConfig.GetString("AuthenticationService", String.Empty);
+                string gridService = serverConfig.GetString("GridService", String.Empty);
+                string presenceService = serverConfig.GetString("PresenceService", String.Empty);
-            // These 3 are mandatory, the others aren't
+                string simulationService = serverConfig.GetString("SimulationService", String.Empty);
-            if (gridService == string.Empty || presenceService == string.Empty || m_AuthDll == string.Empty)
-                throw new Exception("Incomplete specifications, Gatekeeper Service cannot function.");
+                // These 3 are mandatory, the others aren't
-            
+                if (gridService == string.Empty || presenceService == string.Empty)
-            string scope = serverConfig.GetString("ScopeID", UUID.Zero.ToString());
+                    throw new Exception("Incomplete specifications, Gatekeeper Service cannot function.");
-            UUID.TryParse(scope, out m_ScopeID);
+                
-            //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!");
+                string scope = serverConfig.GetString("ScopeID", UUID.Zero.ToString());
-            m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true);
+                UUID.TryParse(scope, out m_ScopeID);
-            m_ExternalName = serverConfig.GetString("ExternalName", string.Empty);
+                //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!");
+                m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true);
-            Object[] args = new Object[] { config };
+                m_ExternalName = serverConfig.GetString("ExternalName", string.Empty);
-            m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
-            m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args);
+                Object[] args = new Object[] { config };
+                m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
-            if (accountService != string.Empty)
+                m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args);
-                m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
-            if (homeUsersService != string.Empty)
+                if (accountService != string.Empty)
-                m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(homeUsersService, args);
+                    m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
+                if (homeUsersService != string.Empty)
-            if (simService != null)
+                    m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(homeUsersService, args);
-                m_SimulationService = simService;
-            else if (simulationService != string.Empty)
+                if (simService != null)
-                    m_SimulationService = ServerUtils.LoadPlugin<ISimulationService>(simulationService, args);
+                    m_SimulationService = simService;
+                else if (simulationService != string.Empty)
-            if (m_GridService == null || m_PresenceService == null || m_SimulationService == null)
+                        m_SimulationService = ServerUtils.LoadPlugin<ISimulationService>(simulationService, args);
-                throw new Exception("Unable to load a required plugin, Gatekeeper Service cannot function.");
+                if (m_GridService == null || m_PresenceService == null || m_SimulationService == null)
-            m_log.Debug("[GATEKEEPER SERVICE]: Starting...");
+                    throw new Exception("Unable to load a required plugin, Gatekeeper Service cannot function.");
+                m_log.Debug("[GATEKEEPER SERVICE]: Starting...");
+            }
        }
        public GatekeeperService(IConfigSource config)

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index c5cfe75..3fc9327 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -49,61 +49,64 @@ namespace OpenSim.Services.HypergridService
49	LogManager.GetLogger(	49	LogManager.GetLogger(
50	MethodBase.GetCurrentMethod().DeclaringType);	50	MethodBase.GetCurrentMethod().DeclaringType);
51		51
52	IGridService m_GridService;	52	private static bool m_Initialized = false;
53	IPresenceService m_PresenceService;
54	IUserAccountService m_UserAccountService;
55	IUserAgentService m_UserAgentService;
56	ISimulationService m_SimulationService;
57		53
58	string m_AuthDll;	54	private static IGridService m_GridService;
		55	private static IPresenceService m_PresenceService;
		56	private static IUserAccountService m_UserAccountService;
		57	private static IUserAgentService m_UserAgentService;
		58	private static ISimulationService m_SimulationService;
59		59
60	UUID m_ScopeID;	60	private static UUID m_ScopeID;
61	bool m_AllowTeleportsToAnyRegion;	61	private static bool m_AllowTeleportsToAnyRegion;
62	string m_ExternalName;	62	private static string m_ExternalName;
63	GridRegion m_DefaultGatewayRegion;	63	private static GridRegion m_DefaultGatewayRegion;
64		64
65	public GatekeeperService(IConfigSource config, ISimulationService simService)	65	public GatekeeperService(IConfigSource config, ISimulationService simService)
66	{	66	{
67	IConfig serverConfig = config.Configs["GatekeeperService"];	67	if (!m_Initialized)
68	if (serverConfig == null)	68	{
69	throw new Exception(String.Format("No section GatekeeperService in config file"));	69	m_Initialized = true;
70		70
71	string accountService = serverConfig.GetString("UserAccountService", String.Empty);	71	IConfig serverConfig = config.Configs["GatekeeperService"];
72	string homeUsersService = serverConfig.GetString("HomeUsersSecurityService", string.Empty);	72	if (serverConfig == null)
73	string gridService = serverConfig.GetString("GridService", String.Empty);	73	throw new Exception(String.Format("No section GatekeeperService in config file"));
74	string presenceService = serverConfig.GetString("PresenceService", String.Empty);	74
75	string simulationService = serverConfig.GetString("SimulationService", String.Empty);	75	string accountService = serverConfig.GetString("UserAccountService", String.Empty);
76		76	string homeUsersService = serverConfig.GetString("HomeUsersSecurityService", string.Empty);
77	//m_AuthDll = serverConfig.GetString("AuthenticationService", String.Empty);	77	string gridService = serverConfig.GetString("GridService", String.Empty);
78		78	string presenceService = serverConfig.GetString("PresenceService", String.Empty);
79	// These 3 are mandatory, the others aren't	79	string simulationService = serverConfig.GetString("SimulationService", String.Empty);
80	if (gridService == string.Empty \|\| presenceService == string.Empty \|\| m_AuthDll == string.Empty)	80
81	throw new Exception("Incomplete specifications, Gatekeeper Service cannot function.");	81	// These 3 are mandatory, the others aren't
82		82	if (gridService == string.Empty \|\| presenceService == string.Empty)
83	string scope = serverConfig.GetString("ScopeID", UUID.Zero.ToString());	83	throw new Exception("Incomplete specifications, Gatekeeper Service cannot function.");
84	UUID.TryParse(scope, out m_ScopeID);	84
85	//m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!");	85	string scope = serverConfig.GetString("ScopeID", UUID.Zero.ToString());
86	m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true);	86	UUID.TryParse(scope, out m_ScopeID);
87	m_ExternalName = serverConfig.GetString("ExternalName", string.Empty);	87	//m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!");
88		88	m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true);
89	Object[] args = new Object[] { config };	89	m_ExternalName = serverConfig.GetString("ExternalName", string.Empty);
90	m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);	90
91	m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args);	91	Object[] args = new Object[] { config };
92		92	m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
93	if (accountService != string.Empty)	93	m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args);
94	m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);	94
95	if (homeUsersService != string.Empty)	95	if (accountService != string.Empty)
96	m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(homeUsersService, args);	96	m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
97		97	if (homeUsersService != string.Empty)
98	if (simService != null)	98	m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(homeUsersService, args);
99	m_SimulationService = simService;	99
100	else if (simulationService != string.Empty)	100	if (simService != null)
101	m_SimulationService = ServerUtils.LoadPlugin<ISimulationService>(simulationService, args);	101	m_SimulationService = simService;
102		102	else if (simulationService != string.Empty)
103	if (m_GridService == null \|\| m_PresenceService == null \|\| m_SimulationService == null)	103	m_SimulationService = ServerUtils.LoadPlugin<ISimulationService>(simulationService, args);
104	throw new Exception("Unable to load a required plugin, Gatekeeper Service cannot function.");	104
105		105	if (m_GridService == null \|\| m_PresenceService == null \|\| m_SimulationService == null)
106	m_log.Debug("[GATEKEEPER SERVICE]: Starting...");	106	throw new Exception("Unable to load a required plugin, Gatekeeper Service cannot function.");
		107
		108	m_log.Debug("[GATEKEEPER SERVICE]: Starting...");
		109	}
107	}	110	}
108		111
109	public GatekeeperService(IConfigSource config)	112	public GatekeeperService(IConfigSource config)