diff options
author | UbitUmarov | 2017-08-24 01:47:01 +0100 |
---|---|---|
committer | UbitUmarov | 2017-08-24 01:47:01 +0100 |
commit | c5802c94608f7dbd39bb8dd03ecd409fbae83f22 (patch) | |
tree | c9e21a1317bc6ce81284bc0b13aa08b4c3c780d0 /OpenSim | |
parent | add missing file. Also in last commit comment the flag was relative to (un)fr... (diff) | |
download | opensim-SC_OLD-c5802c94608f7dbd39bb8dd03ecd409fbae83f22.zip opensim-SC_OLD-c5802c94608f7dbd39bb8dd03ecd409fbae83f22.tar.gz opensim-SC_OLD-c5802c94608f7dbd39bb8dd03ecd409fbae83f22.tar.bz2 opensim-SC_OLD-c5802c94608f7dbd39bb8dd03ecd409fbae83f22.tar.xz |
change a few more parcel eject code paths
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 | ||||
-rw-r--r-- | OpenSim/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 07d11f9..4471432 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 | |||
1886 | if (land.LandData.LocalID == LandData.LocalID) | 1886 | if (land.LandData.LocalID == LandData.LocalID) |
1887 | { | 1887 | { |
1888 | Vector3 pos = m_scene.GetNearestAllowedPosition(presence, land); | 1888 | Vector3 pos = m_scene.GetNearestAllowedPosition(presence, land); |
1889 | presence.TeleportWithMomentum(pos, null); | 1889 | presence.TeleportOnEject(pos); |
1890 | presence.ControllingClient.SendAlertMessage("You have been ejected from this land"); | 1890 | presence.ControllingClient.SendAlertMessage("You have been ejected from this land"); |
1891 | } | 1891 | } |
1892 | } | 1892 | } |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 22860b1..f9c7031 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1619,7 +1619,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1619 | 1619 | ||
1620 | public void TeleportWithMomentum(Vector3 pos, Vector3? v) | 1620 | public void TeleportWithMomentum(Vector3 pos, Vector3? v) |
1621 | { | 1621 | { |
1622 | if(!CheckLocalTPLandingPoint(ref pos)) | 1622 | if(!CheckLocalTPLandingPoint(ref pos)) |
1623 | return; | 1623 | return; |
1624 | 1624 | ||
1625 | if (ParentID != (uint)0) | 1625 | 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 b810ffb..fa32986 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 | |||
6827 | if (m_host.OwnerID == land.LandData.OwnerID) | 6827 | if (m_host.OwnerID == land.LandData.OwnerID) |
6828 | { | 6828 | { |
6829 | Vector3 p = World.GetNearestAllowedPosition(presence, land); | 6829 | Vector3 p = World.GetNearestAllowedPosition(presence, land); |
6830 | presence.TeleportWithMomentum(p, null); | 6830 | presence.TeleportOnEject(p); |
6831 | presence.ControllingClient.SendAlertMessage("You have been ejected from this land"); | 6831 | presence.ControllingClient.SendAlertMessage("You have been ejected from this land"); |
6832 | } | 6832 | } |
6833 | } | 6833 | } |