aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2012-01-09 00:54:59 +0000
committerMelanie2012-01-09 00:54:59 +0000
commit1ebd79e4134f524f02f9c51f6b143b081eae60f4 (patch)
tree24f50f84a6bbfd0d1f2186798eb379cd5be8af06 /OpenSim/Region
parentUpdate teleport routing to match Avination (diff)
downloadopensim-SC_OLD-1ebd79e4134f524f02f9c51f6b143b081eae60f4.zip
opensim-SC_OLD-1ebd79e4134f524f02f9c51f6b143b081eae60f4.tar.gz
opensim-SC_OLD-1ebd79e4134f524f02f9c51f6b143b081eae60f4.tar.bz2
opensim-SC_OLD-1ebd79e4134f524f02f9c51f6b143b081eae60f4.tar.xz
Add the HG case to landing point checks
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b861c28..164833c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3842,7 +3842,7 @@ namespace OpenSim.Region.Framework.Scenes
3842 // If we come in via login, landmark or map, we want to 3842 // If we come in via login, landmark or map, we want to
3843 // honor landing points. If we come in via Lure, we want 3843 // honor landing points. If we come in via Lure, we want
3844 // to ignore them. 3844 // to ignore them.
3845 if ((m_teleportFlags & (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID)) == (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID) || 3845 if ((m_teleportFlags & (TeleportFlags.ViaLogin | TeleportFlags.ViaHGLogin | TeleportFlags.ViaRegionID)) == (TeleportFlags.ViaLogin | TeleportFlags.ViaHGLogin | TeleportFlags.ViaRegionID) ||
3846 (m_teleportFlags & TeleportFlags.ViaLandmark) != 0 || 3846 (m_teleportFlags & TeleportFlags.ViaLandmark) != 0 ||
3847 (m_teleportFlags & TeleportFlags.ViaLocation) != 0) 3847 (m_teleportFlags & TeleportFlags.ViaLocation) != 0)
3848 { 3848 {