diff options
author | Diva Canto | 2012-02-19 16:48:09 -0800 |
---|---|---|
committer | Diva Canto | 2012-02-19 16:48:09 -0800 |
commit | fdda57cf1083fb1f220f5330e83cda871ad3e5d5 (patch) | |
tree | 91ac2acc221025df4767b9a00dc3208409ad900b /OpenSim/Services/LLLoginService/LLLoginService.cs | |
parent | One more tweak related to the previous 2 commits. (diff) | |
parent | Fix:OmegaX, OmegaY and OmegaZ not saved for child prims http://opensimulator.... (diff) | |
download | opensim-SC_OLD-fdda57cf1083fb1f220f5330e83cda871ad3e5d5.zip opensim-SC_OLD-fdda57cf1083fb1f220f5330e83cda871ad3e5d5.tar.gz opensim-SC_OLD-fdda57cf1083fb1f220f5330e83cda871ad3e5d5.tar.bz2 opensim-SC_OLD-fdda57cf1083fb1f220f5330e83cda871ad3e5d5.tar.xz |
Merge branch '0.7.3-post-fixes' of ssh://opensimulator.org/var/git/opensim into 0.7.3-post-fixes
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')
-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 | { |