* Towards enabling hyperlinks at grid-level.

* Updated grid configs

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
             get { return m_GatekeeperService; }
         }
 
+        private IHypergridService m_HypergridService;
+
         public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server, ISimulationService simService) :
                 base(config, server, String.Empty)
         {
@@ -60,12 +62,17 @@ namespace OpenSim.Server.Handlers.Hypergrid
                 string serviceDll = gridConfig.GetString("LocalServiceModule", string.Empty);
                 Object[] args = new Object[] { config, simService };
                 m_GatekeeperService = ServerUtils.LoadPlugin<IGatekeeperService>(serviceDll, args);
+
+                serviceDll = gridConfig.GetString("HypergridService", string.Empty);
+                m_HypergridService = ServerUtils.LoadPlugin<IHypergridService>(serviceDll, args);
+
             }
-            if (m_GatekeeperService == null)
+            if (m_GatekeeperService == null || m_HypergridService == null)
                 throw new Exception("Gatekeeper server connector cannot proceed because of missing service");
 
-            HypergridHandlers hghandlers = new HypergridHandlers(m_GatekeeperService);
+            HypergridHandlers hghandlers = new HypergridHandlers(m_GatekeeperService, m_HypergridService);
             server.AddXmlRPCHandler("link_region", hghandlers.LinkRegionRequest, false);
+            server.AddXmlRPCHandler("link_region_by_desc", hghandlers.LinkRegionByDescRequest, false);
             server.AddXmlRPCHandler("get_region", hghandlers.GetRegion, false);
             server.AddXmlRPCHandler("get_home_region", hghandlers.GetHomeRegion, false);