From b13eac99963bf4db480f13429895b0131ea07a29 Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 27 Jan 2011 07:07:33 +0100 Subject: [PATCH] Make the estate setting "Allow direct teleport" override the constraint of local tepeports to landing points like it is meant to --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1925daa08c..db9a95b494 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -4426,6 +4426,9 @@ if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for ju if ((TeleportFlags & TeleportFlags.ViaLure) != 0) return; + if (m_scene.RegionInfo.EstateSettings.AllowDirectTeleport) + return; + ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y); if (land.LandData.LandingType == (byte)LandingType.LandingPoint &&