From c5802c94608f7dbd39bb8dd03ecd409fbae83f22 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 24 Aug 2017 01:47:01 +0100 Subject: [PATCH] change a few more parcel eject code paths --- OpenSim/Region/CoreModules/World/Land/LandObject.cs | 2 +- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +- .../Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 07d11f96a6..4471432c2d 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs @@ -1886,7 +1886,7 @@ namespace OpenSim.Region.CoreModules.World.Land if (land.LandData.LocalID == LandData.LocalID) { Vector3 pos = m_scene.GetNearestAllowedPosition(presence, land); - presence.TeleportWithMomentum(pos, null); + presence.TeleportOnEject(pos); presence.ControllingClient.SendAlertMessage("You have been ejected from this land"); } } diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 22860b1297..f9c703116c 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -1619,7 +1619,7 @@ namespace OpenSim.Region.Framework.Scenes public void TeleportWithMomentum(Vector3 pos, Vector3? v) { - if(!CheckLocalTPLandingPoint(ref pos)) + if(!CheckLocalTPLandingPoint(ref pos)) return; if (ParentID != (uint)0) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index b810ffbf66..fa32986a47 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -6827,7 +6827,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (m_host.OwnerID == land.LandData.OwnerID) { Vector3 p = World.GetNearestAllowedPosition(presence, land); - presence.TeleportWithMomentum(p, null); + presence.TeleportOnEject(p); presence.ControllingClient.SendAlertMessage("You have been ejected from this land"); } }