From b5fcb5e872ec138ff7138906bffae193b6dae1a6 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 17 Jan 2010 20:10:42 -0800 Subject: HG teleports through gatekeeper are working. --- .../Services/HypergridService/GatekeeperService.cs | 39 +--------------------- OpenSim/Services/Interfaces/IGatekeeperService.cs | 4 --- 2 files changed, 1 insertion(+), 42 deletions(-) (limited to 'OpenSim/Services') diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 416e443..72db93f 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs @@ -221,44 +221,7 @@ namespace OpenSim.Services.HypergridService return m_SimulationService.CreateAgent(destination, aCircuit, 0, out reason); } - public bool UpdateAgent(GridRegion destination, AgentData agent) - { - // Get the region - destination = m_GridService.GetRegionByUUID(m_ScopeID, destination.RegionID); - if (destination == null) - { - return false; - } - - return m_SimulationService.UpdateAgent(destination, agent); - } - - public bool LoginAttachment(GridRegion destination, ISceneObject sog) - { - // Get the region - destination = m_GridService.GetRegionByUUID(m_ScopeID, destination.RegionID); - if (destination == null) - { - return false; - } - - // May want to filter attachments - return m_SimulationService.CreateObject(destination, sog, false); - } - - public void ReleaseAgent(UUID regionID, UUID agentID) - { - GridRegion region = m_GridService.GetRegionByUUID(m_ScopeID, regionID); - if (region != null) - { - string uri = "http://" + region.ExternalHostName + ":" + region.HttpPort + - "/agent/" + agentID.ToString() + "/" + regionID.ToString() + "/release/"; - - m_SimulationService.ReleaseAgent(regionID, agentID, uri); - } - } - - protected bool Authenticate(AgentCircuitData aCircuit) + protected bool Authenticate(AgentCircuitData aCircuit) { string authURL = string.Empty; if (aCircuit.ServiceURLs.ContainsKey("HomeURI")) diff --git a/OpenSim/Services/Interfaces/IGatekeeperService.cs b/OpenSim/Services/Interfaces/IGatekeeperService.cs index 5e21804..d41df75 100644 --- a/OpenSim/Services/Interfaces/IGatekeeperService.cs +++ b/OpenSim/Services/Interfaces/IGatekeeperService.cs @@ -39,9 +39,5 @@ namespace OpenSim.Services.Interfaces GridRegion GetHyperlinkRegion(UUID regionID); bool LoginAgent(AgentCircuitData aCircuit, GridRegion destination, out string reason); - bool UpdateAgent(GridRegion destination, AgentData agent); - void ReleaseAgent(UUID regionID, UUID agentID); - - bool LoginAttachment(GridRegion destination, ISceneObject sog); } } -- cgit v1.1