Merge branch 'master' into httptests

This commit is contained in:
UbitUmarov
2017-08-24 02:18:40 +01:00
5 changed files with 33 additions and 9 deletions

View File

@@ -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");
}
}