diff options
author | Melanie | 2012-02-18 22:21:10 +0000 |
---|---|---|
committer | Melanie | 2012-02-18 22:21:10 +0000 |
commit | 985526b662f47404404281a3ef4a35afa607bfbf (patch) | |
tree | cbda3c3003b6f456498f0ee3ec6edfc10b5fd64a /OpenSim/Services/LLLoginService/LLLoginService.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.zip opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.tar.gz opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.tar.bz2 opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
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 035980d..6a9b8c6 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -472,6 +472,7 @@ namespace OpenSim.Services.LLLoginService | |||
472 | 472 | ||
473 | position = pinfo.HomePosition; | 473 | position = pinfo.HomePosition; |
474 | lookAt = pinfo.HomeLookAt; | 474 | lookAt = pinfo.HomeLookAt; |
475 | flags |= TeleportFlags.ViaHome; | ||
475 | } | 476 | } |
476 | 477 | ||
477 | if (tryDefaults) | 478 | if (tryDefaults) |
@@ -760,6 +761,7 @@ namespace OpenSim.Services.LLLoginService | |||
760 | { | 761 | { |
761 | circuitCode = (uint)Util.RandomClass.Next(); ; | 762 | circuitCode = (uint)Util.RandomClass.Next(); ; |
762 | aCircuit = MakeAgent(destination, account, avatar, session, secureSession, circuitCode, position, clientIP.Address.ToString(), viewer, channel, mac, id0); | 763 | aCircuit = MakeAgent(destination, account, avatar, session, secureSession, circuitCode, position, clientIP.Address.ToString(), viewer, channel, mac, id0); |
764 | aCircuit.teleportFlags |= (uint)flags; | ||
763 | success = LaunchAgentIndirectly(gatekeeper, destination, aCircuit, clientIP, out reason); | 765 | success = LaunchAgentIndirectly(gatekeeper, destination, aCircuit, clientIP, out reason); |
764 | if (!success && m_GridService != null) | 766 | if (!success && m_GridService != null) |
765 | { | 767 | { |