diff options
author | Oren Hurvitz | 2014-04-06 16:18:40 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-06 15:40:45 +0100 |
commit | abe0f4a0882942e211b17408767eca664762e062 (patch) | |
tree | c58141c3b8aab60e40c69c4e9bf47d46caa959fa /OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs | |
parent | Pass the correct position to QueryAccess() instead of UUID.Zero (it was wrong... (diff) | |
download | opensim-SC_OLD-abe0f4a0882942e211b17408767eca664762e062.zip opensim-SC_OLD-abe0f4a0882942e211b17408767eca664762e062.tar.gz opensim-SC_OLD-abe0f4a0882942e211b17408767eca664762e062.tar.bz2 opensim-SC_OLD-abe0f4a0882942e211b17408767eca664762e062.tar.xz |
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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs | 9 |
1 files changed, 8 insertions, 1 deletions
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 | |||
94 | UUID regionID = UUID.Zero; | 94 | UUID regionID = UUID.Zero; |
95 | UUID.TryParse(regionID_str, out regionID); | 95 | UUID.TryParse(regionID_str, out regionID); |
96 | 96 | ||
97 | UUID agentID = UUID.Zero; | ||
98 | string agentHomeURI = null; | ||
99 | if (requestData.ContainsKey("agent_id")) | ||
100 | agentID = UUID.Parse((string)requestData["agent_id"]); | ||
101 | if (requestData.ContainsKey("agent_home_uri")) | ||
102 | agentHomeURI = (string)requestData["agent_home_uri"]; | ||
103 | |||
97 | string message; | 104 | string message; |
98 | GridRegion regInfo = m_GatekeeperService.GetHyperlinkRegion(regionID, out message); | 105 | GridRegion regInfo = m_GatekeeperService.GetHyperlinkRegion(regionID, agentID, agentHomeURI, out message); |
99 | 106 | ||
100 | Hashtable hash = new Hashtable(); | 107 | Hashtable hash = new Hashtable(); |
101 | if (regInfo == null) | 108 | if (regInfo == null) |