aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2010-12-27 15:25:08 -0800
committerDiva Canto2010-12-27 15:25:08 -0800
commitf801d50a8a2df43b3b4d99ebf32de603e4cfa226 (patch)
tree10df8284fcae0c4140bde3affb0ed412b4447e05 /OpenSim/Region
parentDrop the static from default wearables. It isn't (diff)
downloadopensim-SC_OLD-f801d50a8a2df43b3b4d99ebf32de603e4cfa226.zip
opensim-SC_OLD-f801d50a8a2df43b3b4d99ebf32de603e4cfa226.tar.gz
opensim-SC_OLD-f801d50a8a2df43b3b4d99ebf32de603e4cfa226.tar.bz2
opensim-SC_OLD-f801d50a8a2df43b3b4d99ebf32de603e4cfa226.tar.xz
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.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs14
1 files changed, 12 insertions, 2 deletions
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;
36using OpenSim.Services.Connectors; 36using OpenSim.Services.Connectors;
37using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Server.Base;
39using OpenSim.Services.Interfaces; 40using OpenSim.Services.Interfaces;
40using GridRegion = OpenSim.Services.Interfaces.GridRegion; 41using GridRegion = OpenSim.Services.Interfaces.GridRegion;
41 42
@@ -97,9 +98,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
97 return; 98 return;
98 } 99 }
99 100
101 string networkConnector = gridConfig.GetString("NetworkConnector", string.Empty);
102 if (networkConnector == string.Empty)
103 {
104 m_log.Error("[REMOTE GRID CONNECTOR]: Please specify a network connector under [GridService]");
105 return;
106 }
107
108 Object[] args = new Object[] { source };
109 m_RemoteGridService = ServerUtils.LoadPlugin<IGridService>(networkConnector, args);
110
100 m_LocalGridService = new LocalGridServicesConnector(source); 111 m_LocalGridService = new LocalGridServicesConnector(source);
101 m_RemoteGridService = new GridServicesConnector(source); 112 }
102 }
103 113
104 public void PostInitialise() 114 public void PostInitialise()
105 { 115 {