diff options
author | Justin Clark-Casey (justincc) | 2014-07-21 23:53:33 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-07-21 23:53:33 +0100 |
commit | 3c6becd52495360b24b3760a30fb0e007f5a16a3 (patch) | |
tree | 51362e21c3ea699e948e19ee3ce4a37058d1c337 /OpenSim/Services/LLLoginService | |
parent | minor: Limit processor related stats to 3 decimal places instead of all the p... (diff) | |
download | opensim-SC_OLD-3c6becd52495360b24b3760a30fb0e007f5a16a3.zip opensim-SC_OLD-3c6becd52495360b24b3760a30fb0e007f5a16a3.tar.gz opensim-SC_OLD-3c6becd52495360b24b3760a30fb0e007f5a16a3.tar.bz2 opensim-SC_OLD-3c6becd52495360b24b3760a30fb0e007f5a16a3.tar.xz |
On login and first HG entrance to a foreign grid, perform query access checks before proceeding.
Diffstat (limited to 'OpenSim/Services/LLLoginService')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 5888cce..264a630 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -959,12 +959,19 @@ namespace OpenSim.Services.LLLoginService | |||
959 | 959 | ||
960 | private bool LaunchAgentDirectly(ISimulationService simConnector, GridRegion region, AgentCircuitData aCircuit, TeleportFlags flags, out string reason) | 960 | private bool LaunchAgentDirectly(ISimulationService simConnector, GridRegion region, AgentCircuitData aCircuit, TeleportFlags flags, out string reason) |
961 | { | 961 | { |
962 | string version; | ||
963 | |||
964 | if (!simConnector.QueryAccess(region, aCircuit.AgentID, null, true, aCircuit.startpos, null, out version, out reason)) | ||
965 | return false; | ||
966 | |||
962 | return simConnector.CreateAgent(null, region, aCircuit, (uint)flags, out reason); | 967 | return simConnector.CreateAgent(null, region, aCircuit, (uint)flags, out reason); |
963 | } | 968 | } |
964 | 969 | ||
965 | private bool LaunchAgentIndirectly(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, IPEndPoint clientIP, out string reason) | 970 | private bool LaunchAgentIndirectly(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, IPEndPoint clientIP, out string reason) |
966 | { | 971 | { |
967 | m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); | 972 | string version; |
973 | |||
974 | m_log.Debug("[LLOGIN SERVICE]: Launching agent at " + destination.RegionName); | ||
968 | if (m_UserAgentService.LoginAgentToGrid(null, aCircuit, gatekeeper, destination, true, out reason)) | 975 | if (m_UserAgentService.LoginAgentToGrid(null, aCircuit, gatekeeper, destination, true, out reason)) |
969 | return true; | 976 | return true; |
970 | return false; | 977 | return false; |