diff options
author | Oren Hurvitz | 2014-04-07 09:25:18 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-07 07:32:36 +0100 |
commit | 85d51e57a905ac8f823f345f525837926f4ed2ce (patch) | |
tree | 7fc86c9a7743afb0765cc8d822709e12bbc223f1 /OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |
parent | Refactored: use Scene.GetAgentHomeURI() to get the Home URI of a user (diff) | |
download | opensim-SC-85d51e57a905ac8f823f345f525837926f4ed2ce.zip opensim-SC-85d51e57a905ac8f823f345f525837926f4ed2ce.tar.gz opensim-SC-85d51e57a905ac8f823f345f525837926f4ed2ce.tar.bz2 opensim-SC-85d51e57a905ac8f823f345f525837926f4ed2ce.tar.xz |
When sending QueryAccess to a region, also send the user's Home URI
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 171beaa..98686f8 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -272,9 +272,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
272 | } | 272 | } |
273 | 273 | ||
274 | 274 | ||
275 | /// <summary> | 275 | public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, Vector3 position, out string version, out string reason) |
276 | /// </summary> | ||
277 | public bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string version, out string reason) | ||
278 | { | 276 | { |
279 | reason = "Failed to contact destination"; | 277 | reason = "Failed to contact destination"; |
280 | version = "Unknown"; | 278 | version = "Unknown"; |
@@ -285,10 +283,12 @@ namespace OpenSim.Services.Connectors.Simulation | |||
285 | if (ext == null) return false; | 283 | if (ext == null) return false; |
286 | 284 | ||
287 | // Eventually, we want to use a caps url instead of the agentID | 285 | // Eventually, we want to use a caps url instead of the agentID |
288 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; | 286 | string uri = destination.ServerURI + AgentPath() + agentID + "/" + destination.RegionID.ToString() + "/"; |
289 | 287 | ||
290 | OSDMap request = new OSDMap(); | 288 | OSDMap request = new OSDMap(); |
291 | request.Add("position", OSD.FromString(position.ToString())); | 289 | request.Add("position", OSD.FromString(position.ToString())); |
290 | if (agentHomeURI != null) | ||
291 | request.Add("agent_home_uri", OSD.FromString(agentHomeURI)); | ||
292 | 292 | ||
293 | try | 293 | try |
294 | { | 294 | { |