diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 7f0ab3f..b281e5f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -5792,8 +5792,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
5792 | return true; | 5792 | return true; |
5793 | 5793 | ||
5794 | // respect region owner and managers | 5794 | // respect region owner and managers |
5795 | if(m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid)) | 5795 | // if(m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid)) |
5796 | return true; | 5796 | // return true; |
5797 | 5797 | ||
5798 | if (!m_scene.RegionInfo.EstateSettings.AllowDirectTeleport) | 5798 | if (!m_scene.RegionInfo.EstateSettings.AllowDirectTeleport) |
5799 | { | 5799 | { |
@@ -5823,8 +5823,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
5823 | || (m_teleportFlags & adicionalLandPointFlags) != 0) | 5823 | || (m_teleportFlags & adicionalLandPointFlags) != 0) |
5824 | { | 5824 | { |
5825 | if (land.LandData.LandingType == (byte)LandingType.LandingPoint && | 5825 | if (land.LandData.LandingType == (byte)LandingType.LandingPoint && |
5826 | land.LandData.UserLocation != Vector3.Zero && | 5826 | land.LandData.UserLocation != Vector3.Zero ) |
5827 | land.LandData.OwnerID != m_uuid ) | 5827 | // && |
5828 | // land.LandData.OwnerID != m_uuid ) | ||
5828 | { | 5829 | { |
5829 | pos = land.LandData.UserLocation; | 5830 | pos = land.LandData.UserLocation; |
5830 | if(land.LandData.UserLookAt != Vector3.Zero) | 5831 | if(land.LandData.UserLookAt != Vector3.Zero) |