Fix loading modules with alternate configurations and ports into ROBUST.

Make all current modules support the configuration name option

2 files changed, 7 insertions, 6 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
     public class GridServiceConnector : ServiceConnector
     {
         private IGridService m_GridService;
+        private string m_ConfigName = "GridService";
 
-        public GridServiceConnector(IConfigSource config, IHttpServer server) :
-                base(config, server)
+        public GridServiceConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
-            IConfig serverConfig = config.Configs["GridService"];
+            IConfig serverConfig = config.Configs[m_ConfigName];
             if (serverConfig == null)
-                throw new Exception("No section 'Server' in config file");
+                throw new Exception(String.Format("No section {0} in config file", m_ConfigName));
 
             string gridService = serverConfig.GetString("LocalServiceModule",
                     String.Empty);
 
             if (gridService == String.Empty)
-                throw new Exception("No GridService in config file");
+                throw new Exception("No LocalServiceModule in config file");
 
             Object[] args = new Object[] { config };
             m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
diff --git a/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs b/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs
index c47f652..115ac29 100644
--- a/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs
+++ b/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Server.Handlers.Grid
         private IHyperlinkService m_HyperlinkService;
 
         public HypergridServiceInConnector(IConfigSource config, IHttpServer server, IHyperlinkService hyperService) :
-                base(config, server)
+                base(config, server, String.Empty)
         {
             m_HyperlinkService = hyperService;
             server.AddXmlRPCHandler("link_region", LinkRegionRequest, false);