aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Grid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Server/Handlers/Grid')
-rw-r--r--OpenSim/Server/Handlers/Grid/GridServerConnector.cs11
-rw-r--r--OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs2
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
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);
diff --git a/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs b/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs
index ad63485..e226759 100644
--- a/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs
+++ b/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Server.Handlers.Grid
51 private List<SimpleRegionInfo> m_RegionsOnSim = new List<SimpleRegionInfo>(); 51 private List<SimpleRegionInfo> m_RegionsOnSim = new List<SimpleRegionInfo>();
52 52
53 public HypergridServiceInConnector(IConfigSource config, IHttpServer server) : 53 public HypergridServiceInConnector(IConfigSource config, IHttpServer server) :
54 base(config, server) 54 base(config, server, String.Empty)
55 { 55 {
56 server.AddXmlRPCHandler("linkk_region", LinkRegionRequest, false); 56 server.AddXmlRPCHandler("linkk_region", LinkRegionRequest, false);
57 } 57 }