aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService/LLLoginService.cs
diff options
context:
space:
mode:
authorBlueWall2012-02-18 00:32:09 -0500
committerBlueWall2012-02-18 00:32:09 -0500
commit7bdcf9eb26842af57e31f3cecd4f403a39a27bc0 (patch)
tree1b09fefccc8fde9afb3bbc052358ef3a6ffbdefb /OpenSim/Services/LLLoginService/LLLoginService.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-7bdcf9eb26842af57e31f3cecd4f403a39a27bc0.zip
opensim-SC_OLD-7bdcf9eb26842af57e31f3cecd4f403a39a27bc0.tar.gz
opensim-SC_OLD-7bdcf9eb26842af57e31f3cecd4f403a39a27bc0.tar.bz2
opensim-SC_OLD-7bdcf9eb26842af57e31f3cecd4f403a39a27bc0.tar.xz
Propagate our teleport flags on logins
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs2
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 {