aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorDiva Canto2010-01-17 20:10:42 -0800
committerDiva Canto2010-01-17 20:10:42 -0800
commitb5fcb5e872ec138ff7138906bffae193b6dae1a6 (patch)
treeedbf410ccc19cc118287513222e1e6d3a090b332 /OpenSim/Services
parentAgent gets there through the Gatekeeper, but still a few quirks to fix. (diff)
downloadopensim-SC_OLD-b5fcb5e872ec138ff7138906bffae193b6dae1a6.zip
opensim-SC_OLD-b5fcb5e872ec138ff7138906bffae193b6dae1a6.tar.gz
opensim-SC_OLD-b5fcb5e872ec138ff7138906bffae193b6dae1a6.tar.bz2
opensim-SC_OLD-b5fcb5e872ec138ff7138906bffae193b6dae1a6.tar.xz
HG teleports through gatekeeper are working.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/HypergridService/GatekeeperService.cs39
-rw-r--r--OpenSim/Services/Interfaces/IGatekeeperService.cs4
2 files changed, 1 insertions, 42 deletions
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
221 return m_SimulationService.CreateAgent(destination, aCircuit, 0, out reason); 221 return m_SimulationService.CreateAgent(destination, aCircuit, 0, out reason);
222 } 222 }
223 223
224 public bool UpdateAgent(GridRegion destination, AgentData agent) 224 protected bool Authenticate(AgentCircuitData aCircuit)
225 {
226 // Get the region
227 destination = m_GridService.GetRegionByUUID(m_ScopeID, destination.RegionID);
228 if (destination == null)
229 {
230 return false;
231 }
232
233 return m_SimulationService.UpdateAgent(destination, agent);
234 }
235
236 public bool LoginAttachment(GridRegion destination, ISceneObject sog)
237 {
238 // Get the region
239 destination = m_GridService.GetRegionByUUID(m_ScopeID, destination.RegionID);
240 if (destination == null)
241 {
242 return false;
243 }
244
245 // May want to filter attachments
246 return m_SimulationService.CreateObject(destination, sog, false);
247 }
248
249 public void ReleaseAgent(UUID regionID, UUID agentID)
250 {
251 GridRegion region = m_GridService.GetRegionByUUID(m_ScopeID, regionID);
252 if (region != null)
253 {
254 string uri = "http://" + region.ExternalHostName + ":" + region.HttpPort +
255 "/agent/" + agentID.ToString() + "/" + regionID.ToString() + "/release/";
256
257 m_SimulationService.ReleaseAgent(regionID, agentID, uri);
258 }
259 }
260
261 protected bool Authenticate(AgentCircuitData aCircuit)
262 { 225 {
263 string authURL = string.Empty; 226 string authURL = string.Empty;
264 if (aCircuit.ServiceURLs.ContainsKey("HomeURI")) 227 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
39 GridRegion GetHyperlinkRegion(UUID regionID); 39 GridRegion GetHyperlinkRegion(UUID regionID);
40 40
41 bool LoginAgent(AgentCircuitData aCircuit, GridRegion destination, out string reason); 41 bool LoginAgent(AgentCircuitData aCircuit, GridRegion destination, out string reason);
42 bool UpdateAgent(GridRegion destination, AgentData agent);
43 void ReleaseAgent(UUID regionID, UUID agentID);
44
45 bool LoginAttachment(GridRegion destination, ISceneObject sog);
46 } 42 }
47} 43}