From abe0f4a0882942e211b17408767eca664762e062 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Sun, 6 Apr 2014 16:18:40 +0300
Subject: When preparing a Hypergrid teleport, tell the receiving grid which
 user is entering the grid.

This can affect which region to use. E.g., returning users may be allowed to enter any region, whereas users from other grids will have to enter a gateway region. Previously per-user decisions were only made later, but by then it's too late to change which region the user enters.
---
 OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Server')

diff --git a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
index a89d7f7..c7ac9be 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
@@ -94,8 +94,15 @@ namespace OpenSim.Server.Handlers.Hypergrid
             UUID regionID = UUID.Zero;
             UUID.TryParse(regionID_str, out regionID);
 
+            UUID agentID = UUID.Zero;
+            string agentHomeURI = null;
+            if (requestData.ContainsKey("agent_id"))
+                agentID = UUID.Parse((string)requestData["agent_id"]);
+            if (requestData.ContainsKey("agent_home_uri"))
+                agentHomeURI = (string)requestData["agent_home_uri"];
+
             string message;
-            GridRegion regInfo = m_GatekeeperService.GetHyperlinkRegion(regionID, out message);
+            GridRegion regInfo = m_GatekeeperService.GetHyperlinkRegion(regionID, agentID, agentHomeURI, out message);
 
             Hashtable hash = new Hashtable();
             if (regInfo == null)
-- 
cgit v1.1