OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change a few more parcel eject code paths

BulletSim2017
UbitUmarov 2017-08-24 01:47:01 +01:00
parent 1a7c8893ee
commit c5802c9460
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@ -1886,7 +1886,7 @@ namespace OpenSim.Region.CoreModules.World.Land
if (land.LandData.LocalID == LandData.LocalID) if (land.LandData.LocalID == LandData.LocalID)
{ {
Vector3 pos = m_scene.GetNearestAllowedPosition(presence, land); Vector3 pos = m_scene.GetNearestAllowedPosition(presence, land);
presence.TeleportWithMomentum(pos, null); presence.TeleportOnEject(pos);
presence.ControllingClient.SendAlertMessage("You have been ejected from this land"); presence.ControllingClient.SendAlertMessage("You have been ejected from this land");
} }
} }

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1619,7 +1619,7 @@ namespace OpenSim.Region.Framework.Scenes
public void TeleportWithMomentum(Vector3 pos, Vector3? v) public void TeleportWithMomentum(Vector3 pos, Vector3? v)
{ {
if(!CheckLocalTPLandingPoint(ref pos)) if(!CheckLocalTPLandingPoint(ref pos))
return; return;
if (ParentID != (uint)0) if (ParentID != (uint)0)

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -6827,7 +6827,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (m_host.OwnerID == land.LandData.OwnerID) if (m_host.OwnerID == land.LandData.OwnerID)
{ {
Vector3 p = World.GetNearestAllowedPosition(presence, land); Vector3 p = World.GetNearestAllowedPosition(presence, land);
presence.TeleportWithMomentum(p, null); presence.TeleportOnEject(p);
presence.ControllingClient.SendAlertMessage("You have been ejected from this land"); presence.ControllingClient.SendAlertMessage("You have been ejected from this land");
} }
} }