diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs index dfba0d6994..33cc838322 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() { diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 5624a380d3..ce5588eb1b 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini @@ -37,6 +37,8 @@ LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" ; for the LocalGridServicesConnector which is used by the Remote one StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" + + NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector" [LibraryService] LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index e983755787..5142d90eda 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -49,6 +49,8 @@ LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" + NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector" + ; Needed to display non-default map tile images for linked regions AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini index 29b51deacd..0b011168d8 100644 --- a/bin/config-include/HyperSimianGrid.ini +++ b/bin/config-include/HyperSimianGrid.ini @@ -21,7 +21,7 @@ Include-Common = "config-include/GridCommon.ini" [Modules] - GridServices = "SimianGridServiceConnector" + GridServices = "RemoteGridServicesConnector" PresenceServices = "SimianPresenceServiceConnector" UserAccountServices = "SimianUserAccountServiceConnector" AuthenticationServices = "SimianAuthenticationServiceConnector" @@ -53,7 +53,8 @@ [GridService] LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" - + NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector" + AllowHypergridMapSearch = true [LibraryService] diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini index 239ce3093c..311a55b90e 100644 --- a/bin/config-include/SimianGrid.ini +++ b/bin/config-include/SimianGrid.ini @@ -21,7 +21,7 @@ Include-Common = "config-include/GridCommon.ini" [Modules] - GridServices = "SimianGridServiceConnector" + GridServices = "RemoteGridServicesConnector" PresenceServices = "SimianPresenceServiceConnector" UserAccountServices = "SimianUserAccountServiceConnector" AuthenticationServices = "SimianAuthenticationServiceConnector" @@ -53,6 +53,7 @@ [GridService] LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" + NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector" [LibraryService] LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"