From b34652e9eb109ab280610925716b40d40882bf59 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 26 Jan 2016 21:42:46 +0000 Subject: [PATCH] accept mantis 7785 requests, at least until bullet can be also be used fix landing height. (could not test) --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 7f0ab3f3b4..b281e5f12f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -5792,8 +5792,8 @@ namespace OpenSim.Region.Framework.Scenes return true; // respect region owner and managers - if(m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid)) - return true; +// if(m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid)) +// return true; if (!m_scene.RegionInfo.EstateSettings.AllowDirectTeleport) { @@ -5823,8 +5823,9 @@ namespace OpenSim.Region.Framework.Scenes || (m_teleportFlags & adicionalLandPointFlags) != 0) { if (land.LandData.LandingType == (byte)LandingType.LandingPoint && - land.LandData.UserLocation != Vector3.Zero && - land.LandData.OwnerID != m_uuid ) + land.LandData.UserLocation != Vector3.Zero ) + // && + // land.LandData.OwnerID != m_uuid ) { pos = land.LandData.UserLocation; if(land.LandData.UserLookAt != Vector3.Zero)