aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
diff options
context:
space:
mode:
authorDiva Canto2010-01-18 20:35:59 -0800
committerDiva Canto2010-01-18 20:35:59 -0800
commit9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8 (patch)
treeb81216bbac54d79b6011657ed58e7957f0d1f13e /OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
parentCheck for impersonations at the Gatekeeper. (diff)
downloadopensim-SC_OLD-9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8.zip
opensim-SC_OLD-9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8.tar.gz
opensim-SC_OLD-9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8.tar.bz2
opensim-SC_OLD-9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8.tar.xz
* Towards enabling hyperlinks at grid-level.
* Updated grid configs
Diffstat (limited to 'OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs')
-rw-r--r--OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs11
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
index 15b29d2..940ec7a 100644
--- a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
@@ -51,6 +51,8 @@ namespace OpenSim.Server.Handlers.Hypergrid
51 get { return m_GatekeeperService; } 51 get { return m_GatekeeperService; }
52 } 52 }
53 53
54 private IHypergridService m_HypergridService;
55
54 public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server, ISimulationService simService) : 56 public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server, ISimulationService simService) :
55 base(config, server, String.Empty) 57 base(config, server, String.Empty)
56 { 58 {
@@ -60,12 +62,17 @@ namespace OpenSim.Server.Handlers.Hypergrid
60 string serviceDll = gridConfig.GetString("LocalServiceModule", string.Empty); 62 string serviceDll = gridConfig.GetString("LocalServiceModule", string.Empty);
61 Object[] args = new Object[] { config, simService }; 63 Object[] args = new Object[] { config, simService };
62 m_GatekeeperService = ServerUtils.LoadPlugin<IGatekeeperService>(serviceDll, args); 64 m_GatekeeperService = ServerUtils.LoadPlugin<IGatekeeperService>(serviceDll, args);
65
66 serviceDll = gridConfig.GetString("HypergridService", string.Empty);
67 m_HypergridService = ServerUtils.LoadPlugin<IHypergridService>(serviceDll, args);
68
63 } 69 }
64 if (m_GatekeeperService == null) 70 if (m_GatekeeperService == null || m_HypergridService == null)
65 throw new Exception("Gatekeeper server connector cannot proceed because of missing service"); 71 throw new Exception("Gatekeeper server connector cannot proceed because of missing service");
66 72
67 HypergridHandlers hghandlers = new HypergridHandlers(m_GatekeeperService); 73 HypergridHandlers hghandlers = new HypergridHandlers(m_GatekeeperService, m_HypergridService);
68 server.AddXmlRPCHandler("link_region", hghandlers.LinkRegionRequest, false); 74 server.AddXmlRPCHandler("link_region", hghandlers.LinkRegionRequest, false);
75 server.AddXmlRPCHandler("link_region_by_desc", hghandlers.LinkRegionByDescRequest, false);
69 server.AddXmlRPCHandler("get_region", hghandlers.GetRegion, false); 76 server.AddXmlRPCHandler("get_region", hghandlers.GetRegion, false);
70 server.AddXmlRPCHandler("get_home_region", hghandlers.GetHomeRegion, false); 77 server.AddXmlRPCHandler("get_home_region", hghandlers.GetHomeRegion, false);
71 78