diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 641d742..b5f789b 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3832,7 +3832,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3832 | land.LandData.UserLocation != Vector3.Zero && | 3832 | land.LandData.UserLocation != Vector3.Zero && |
3833 | land.LandData.OwnerID != m_uuid && | 3833 | land.LandData.OwnerID != m_uuid && |
3834 | (!m_scene.Permissions.IsGod(m_uuid)) && | 3834 | (!m_scene.Permissions.IsGod(m_uuid)) && |
3835 | (!m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid))) | 3835 | (!m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid))) |
3836 | { | 3836 | { |
3837 | float curr = Vector3.Distance(AbsolutePosition, pos); | 3837 | float curr = Vector3.Distance(AbsolutePosition, pos); |
3838 | if (Vector3.Distance(land.LandData.UserLocation, pos) < curr) | 3838 | if (Vector3.Distance(land.LandData.UserLocation, pos) < curr) |
@@ -3852,7 +3852,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3852 | { | 3852 | { |
3853 | if (GodLevel < 200 && | 3853 | if (GodLevel < 200 && |
3854 | ((!m_scene.Permissions.IsGod(m_uuid) && | 3854 | ((!m_scene.Permissions.IsGod(m_uuid) && |
3855 | !m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid)) || | 3855 | !m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid)) || |
3856 | (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || | 3856 | (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || |
3857 | (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0)) | 3857 | (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0)) |
3858 | { | 3858 | { |
@@ -3920,7 +3920,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3920 | GodLevel < 200 && | 3920 | GodLevel < 200 && |
3921 | ((land.LandData.OwnerID != m_uuid && | 3921 | ((land.LandData.OwnerID != m_uuid && |
3922 | !m_scene.Permissions.IsGod(m_uuid) && | 3922 | !m_scene.Permissions.IsGod(m_uuid) && |
3923 | !m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid)) || | 3923 | !m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid)) || |
3924 | (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || | 3924 | (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || |
3925 | (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0)) | 3925 | (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0)) |
3926 | { | 3926 | { |