diff options
author | Oren Hurvitz | 2014-04-09 08:03:25 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-09 09:22:20 +0100 |
commit | 06e0528d0b9929cbd8d2b360b0baa00288340d13 (patch) | |
tree | 0ffd33e5eda96badff712bdd78794ce6debbb392 /OpenSim/Services/LLLoginService | |
parent | Log when the presence service logs-out all the users in a region (diff) | |
download | opensim-SC_OLD-06e0528d0b9929cbd8d2b360b0baa00288340d13.zip opensim-SC_OLD-06e0528d0b9929cbd8d2b360b0baa00288340d13.tar.gz opensim-SC_OLD-06e0528d0b9929cbd8d2b360b0baa00288340d13.tar.bz2 opensim-SC_OLD-06e0528d0b9929cbd8d2b360b0baa00288340d13.tar.xz |
In teleports, pass the source region to the destination (similar to an HTTP referrer)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index a2fb308..25c9417 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -905,13 +905,6 @@ namespace OpenSim.Services.LLLoginService | |||
905 | SetServiceURLs(aCircuit, account); | 905 | SetServiceURLs(aCircuit, account); |
906 | 906 | ||
907 | return aCircuit; | 907 | return aCircuit; |
908 | |||
909 | //m_UserAgentService.LoginAgentToGrid(aCircuit, GatekeeperServiceConnector, region, out reason); | ||
910 | //if (simConnector.CreateAgent(region, aCircuit, 0, out reason)) | ||
911 | // return aCircuit; | ||
912 | |||
913 | //return null; | ||
914 | |||
915 | } | 908 | } |
916 | 909 | ||
917 | private void SetServiceURLs(AgentCircuitData aCircuit, UserAccount account) | 910 | private void SetServiceURLs(AgentCircuitData aCircuit, UserAccount account) |
@@ -966,13 +959,13 @@ namespace OpenSim.Services.LLLoginService | |||
966 | 959 | ||
967 | 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) |
968 | { | 961 | { |
969 | return simConnector.CreateAgent(region, aCircuit, (uint)flags, out reason); | 962 | return simConnector.CreateAgent(null, region, aCircuit, (uint)flags, out reason); |
970 | } | 963 | } |
971 | 964 | ||
972 | private bool LaunchAgentIndirectly(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, IPEndPoint clientIP, out string reason) | 965 | private bool LaunchAgentIndirectly(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, IPEndPoint clientIP, out string reason) |
973 | { | 966 | { |
974 | m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); | 967 | m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); |
975 | if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, true, out reason)) | 968 | if (m_UserAgentService.LoginAgentToGrid(null, aCircuit, gatekeeper, destination, true, out reason)) |
976 | return true; | 969 | return true; |
977 | return false; | 970 | return false; |
978 | } | 971 | } |