From d49a5374c37967110a8bf11844893f62951878ee Mon Sep 17 00:00:00 2001
From: AliciaRaven
Date: Sat, 10 Dec 2016 18:03:05 +0000
Subject: Make it more unlikely that a script teleport will be caught by
 default region landing point.

---
 .../Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 +-
 OpenSim/Region/Framework/Scenes/ScenePresence.cs                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index ad094b4..58d6cf2 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -456,7 +456,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
 
             // Check Default Location (Also See ScenePresence.CompleteMovement)
-            if (position.X == 128f && position.Y == 128f)
+            if (position.X == 128f && position.Y == 128f && position.Z == 22.5f)
                 position = sp.Scene.RegionInfo.DefaultLandingPoint;
 
             // TODO: Get proper AVG Height
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d501b7f..463f6c8 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2044,7 +2044,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 // Check Default Location (Also See EntityTransferModule.TeleportAgentWithinRegion)
-                if (AbsolutePosition.X == 128f && AbsolutePosition.Y == 128f)
+                if (AbsolutePosition.X == 128f && AbsolutePosition.Y == 128f && AbsolutePosition.Z == 22.5f)
                     AbsolutePosition = Scene.RegionInfo.DefaultLandingPoint;
 
                 if (!MakeRootAgent(AbsolutePosition, flying, ref look))
-- 
cgit v1.1