aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5695c08..6990be1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3842,9 +3842,11 @@ 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)Constants.TeleportFlags.ViaHGLogin | TeleportFlags.ViaRegionID)) == (TeleportFlags.ViaLogin | (TeleportFlags)Constants.TeleportFlags.ViaHGLogin | TeleportFlags.ViaRegionID) || 3845 if ((m_teleportFlags & (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID)) ==
3846 (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID) ||
3846 (m_teleportFlags & TeleportFlags.ViaLandmark) != 0 || 3847 (m_teleportFlags & TeleportFlags.ViaLandmark) != 0 ||
3847 (m_teleportFlags & TeleportFlags.ViaLocation) != 0) 3848 (m_teleportFlags & TeleportFlags.ViaLocation) != 0 ||
3849 ((m_teleportFlags & (TeleportFlags)Constants.TeleportFlags.ViaHGLogin) == (TeleportFlags)Constants.TeleportFlags.ViaHGLogin))
3848 { 3850 {
3849 // Don't restrict gods, estate managers, or land owners to 3851 // Don't restrict gods, estate managers, or land owners to
3850 // the TP point. This behaviour mimics agni. 3852 // the TP point. This behaviour mimics agni.