Integrated the hyperlinking with the GridService.

This commit is contained in:
Diva Canto
2010-01-24 14:30:48 -08:00
parent 5908b8ed7c
commit 48b03c2c61
14 changed files with 878 additions and 1346 deletions

View File

@@ -51,8 +51,6 @@ 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)
{
@@ -63,16 +61,12 @@ namespace OpenSim.Server.Handlers.Hypergrid
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 || m_HypergridService == null)
if (m_GatekeeperService == null)
throw new Exception("Gatekeeper server connector cannot proceed because of missing service");
HypergridHandlers hghandlers = new HypergridHandlers(m_GatekeeperService, m_HypergridService);
HypergridHandlers hghandlers = new HypergridHandlers(m_GatekeeperService);
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);