aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2012-01-09 01:05:19 +0000
committerMelanie2012-01-09 01:05:19 +0000
commit0e855fea7c8fa6e193bc840bc1710a7ff1947625 (patch)
treed63b93d445d78ad3772e51bd007aa934a3746078 /OpenSim
parentAdd the HG case to landing point checks (diff)
downloadopensim-SC_OLD-0e855fea7c8fa6e193bc840bc1710a7ff1947625.zip
opensim-SC_OLD-0e855fea7c8fa6e193bc840bc1710a7ff1947625.tar.gz
opensim-SC_OLD-0e855fea7c8fa6e193bc840bc1710a7ff1947625.tar.bz2
opensim-SC_OLD-0e855fea7c8fa6e193bc840bc1710a7ff1947625.tar.xz
Fix a build break
Diffstat (limited to 'OpenSim')
-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 164833c..5695c08 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.ViaHGLogin | TeleportFlags.ViaRegionID)) == (TeleportFlags.ViaLogin | TeleportFlags.ViaHGLogin | TeleportFlags.ViaRegionID) || 3845 if ((m_teleportFlags & (TeleportFlags.ViaLogin | (TeleportFlags)Constants.TeleportFlags.ViaHGLogin | TeleportFlags.ViaRegionID)) == (TeleportFlags.ViaLogin | (TeleportFlags)Constants.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 {