diff options
author | BlueWall | 2012-02-18 00:32:09 -0500 |
---|---|---|
committer | BlueWall | 2012-02-19 12:41:30 -0500 |
commit | 86e8a56fe1ac6913a11160519ddd66f648756241 (patch) | |
tree | bb04b235d041099a1a7af556d075143ad7586a37 /OpenSim/Services/LLLoginService/LLLoginService.cs | |
parent | Parcel sales support to SQLite (diff) | |
download | opensim-SC_OLD-86e8a56fe1ac6913a11160519ddd66f648756241.zip opensim-SC_OLD-86e8a56fe1ac6913a11160519ddd66f648756241.tar.gz opensim-SC_OLD-86e8a56fe1ac6913a11160519ddd66f648756241.tar.bz2 opensim-SC_OLD-86e8a56fe1ac6913a11160519ddd66f648756241.tar.xz |
Propagate our teleport flags on logins
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 02b5cc1..5dff512 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -465,6 +465,7 @@ namespace OpenSim.Services.LLLoginService | |||
465 | 465 | ||
466 | position = pinfo.HomePosition; | 466 | position = pinfo.HomePosition; |
467 | lookAt = pinfo.HomeLookAt; | 467 | lookAt = pinfo.HomeLookAt; |
468 | flags |= TeleportFlags.ViaHome; | ||
468 | } | 469 | } |
469 | 470 | ||
470 | if (tryDefaults) | 471 | if (tryDefaults) |
@@ -753,6 +754,7 @@ namespace OpenSim.Services.LLLoginService | |||
753 | { | 754 | { |
754 | circuitCode = (uint)Util.RandomClass.Next(); ; | 755 | circuitCode = (uint)Util.RandomClass.Next(); ; |
755 | aCircuit = MakeAgent(destination, account, avatar, session, secureSession, circuitCode, position, clientIP.Address.ToString(), viewer, channel, mac, id0); | 756 | aCircuit = MakeAgent(destination, account, avatar, session, secureSession, circuitCode, position, clientIP.Address.ToString(), viewer, channel, mac, id0); |
757 | aCircuit.teleportFlags |= (uint)flags; | ||
756 | success = LaunchAgentIndirectly(gatekeeper, destination, aCircuit, clientIP, out reason); | 758 | success = LaunchAgentIndirectly(gatekeeper, destination, aCircuit, clientIP, out reason); |
757 | if (!success && m_GridService != null) | 759 | if (!success && m_GridService != null) |
758 | { | 760 | { |