From 7b84942f868a0c0d54a9ccb3627434cbf0e91417 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 10 Jan 2012 11:10:47 -0800
Subject: HG landing points: this hopefully fixes some confusion that was
 making HG avies always land in 0,0

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 1869417..3c9bde8 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3851,17 +3851,18 @@ namespace OpenSim.Region.Framework.Scenes
                     (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID) ||
                     (m_teleportFlags & TeleportFlags.ViaLandmark) != 0 ||
                     (m_teleportFlags & TeleportFlags.ViaLocation) != 0 ||
-                    ((m_teleportFlags & (TeleportFlags)Constants.TeleportFlags.ViaHGLogin) == (TeleportFlags)Constants.TeleportFlags.ViaHGLogin))
+                    (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0)
                 {
                     // Don't restrict gods, estate managers, or land owners to
                     // the TP point. This behaviour mimics agni.
                     if (land.LandData.LandingType == (byte)LandingType.LandingPoint &&
                         land.LandData.UserLocation != Vector3.Zero &&
                         GodLevel < 200 &&
-                        ((land.LandData.OwnerID != m_uuid &&
-                        (!m_scene.Permissions.IsGod(m_uuid)) &&
-                        (!m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid))) || (m_teleportFlags & TeleportFlags.ViaLocation) != 0) ||
-                        ((m_teleportFlags & (TeleportFlags)Constants.TeleportFlags.ViaHGLogin) == (TeleportFlags)Constants.TeleportFlags.ViaHGLogin))
+                        ((land.LandData.OwnerID != m_uuid && 
+                          !m_scene.Permissions.IsGod(m_uuid) &&
+                          !m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid)) || 
+                         (m_teleportFlags & TeleportFlags.ViaLocation) != 0 ||
+                         (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0))
                     {
                         pos = land.LandData.UserLocation;
                     }
-- 
cgit v1.1