diff options
author | Melanie | 2009-09-29 09:44:12 +0100 |
---|---|---|
committer | Melanie | 2009-09-29 09:44:12 +0100 |
commit | 1096103d66d7391943efa85553f46a633cf0d3ee (patch) | |
tree | b960261309079800539eb3d25f1f187d89d0702a /OpenSim/Server/Handlers/Grid/GridServerConnector.cs | |
parent | Fixed bug in HG that was causing secondlife:// refs to bomb the client. (diff) | |
download | opensim-SC_OLD-1096103d66d7391943efa85553f46a633cf0d3ee.zip opensim-SC_OLD-1096103d66d7391943efa85553f46a633cf0d3ee.tar.gz opensim-SC_OLD-1096103d66d7391943efa85553f46a633cf0d3ee.tar.bz2 opensim-SC_OLD-1096103d66d7391943efa85553f46a633cf0d3ee.tar.xz |
Fix loading modules with alternate configurations and ports into ROBUST.
Make all current modules support the configuration name option
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Grid/GridServerConnector.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridServerConnector.cs b/OpenSim/Server/Handlers/Grid/GridServerConnector.cs index ebdf489..14daf12 100644 --- a/OpenSim/Server/Handlers/Grid/GridServerConnector.cs +++ b/OpenSim/Server/Handlers/Grid/GridServerConnector.cs | |||
@@ -37,19 +37,20 @@ namespace OpenSim.Server.Handlers.Grid | |||
37 | public class GridServiceConnector : ServiceConnector | 37 | public class GridServiceConnector : ServiceConnector |
38 | { | 38 | { |
39 | private IGridService m_GridService; | 39 | private IGridService m_GridService; |
40 | private string m_ConfigName = "GridService"; | ||
40 | 41 | ||
41 | public GridServiceConnector(IConfigSource config, IHttpServer server) : | 42 | public GridServiceConnector(IConfigSource config, IHttpServer server, string configName) : |
42 | base(config, server) | 43 | base(config, server, configName) |
43 | { | 44 | { |
44 | IConfig serverConfig = config.Configs["GridService"]; | 45 | IConfig serverConfig = config.Configs[m_ConfigName]; |
45 | if (serverConfig == null) | 46 | if (serverConfig == null) |
46 | throw new Exception("No section 'Server' in config file"); | 47 | throw new Exception(String.Format("No section {0} in config file", m_ConfigName)); |
47 | 48 | ||
48 | string gridService = serverConfig.GetString("LocalServiceModule", | 49 | string gridService = serverConfig.GetString("LocalServiceModule", |
49 | String.Empty); | 50 | String.Empty); |
50 | 51 | ||
51 | if (gridService == String.Empty) | 52 | if (gridService == String.Empty) |
52 | throw new Exception("No GridService in config file"); | 53 | throw new Exception("No LocalServiceModule in config file"); |
53 | 54 | ||
54 | Object[] args = new Object[] { config }; | 55 | Object[] args = new Object[] { config }; |
55 | m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args); | 56 | m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args); |