From f801d50a8a2df43b3b4d99ebf32de603e4cfa226 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 27 Dec 2010 15:25:08 -0800 Subject: WARNING: simulator config var change! This affects only system-facing configs. Nothing to do if you follow the rules of not messing with Grid.ini and GridHypergrid.ini. Change the remote Grid region module so that it takes the network connector as a config variable. This allows the region plugin to be reused for both Robust and Simian network connectors. --- .../Grid/RemoteGridServiceConnector.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs') diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs index dfba0d6..33cc838 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs @@ -36,6 +36,7 @@ using OpenSim.Framework; using OpenSim.Services.Connectors; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; +using OpenSim.Server.Base; using OpenSim.Services.Interfaces; using GridRegion = OpenSim.Services.Interfaces.GridRegion; @@ -97,9 +98,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid return; } + string networkConnector = gridConfig.GetString("NetworkConnector", string.Empty); + if (networkConnector == string.Empty) + { + m_log.Error("[REMOTE GRID CONNECTOR]: Please specify a network connector under [GridService]"); + return; + } + + Object[] args = new Object[] { source }; + m_RemoteGridService = ServerUtils.LoadPlugin(networkConnector, args); + m_LocalGridService = new LocalGridServicesConnector(source); - m_RemoteGridService = new GridServicesConnector(source); - } + } public void PostInitialise() { -- cgit v1.1