From f45746613d83bd909718c4ca9a590cfe933f05e3 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 5 Jul 2011 04:02:16 +0100 Subject: [PATCH] Revert "If a user has the rights to edit a parcel's properties, then also allow them always to enter that parcel." This reverts commit b8e7258051abab3e1310dd8b08cb1d2e09fa21e3. Letting this go in would prevent land owners from banning someone who would have incidental editing rights through a group. The land owner should be the only unbannable person. --- OpenSim/Region/CoreModules/World/Land/LandObject.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 04b20d44df..2a6d362833 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs @@ -449,7 +449,7 @@ namespace OpenSim.Region.CoreModules.World.Land public bool IsBannedFromLand(UUID avatar) { - if (m_scene.Permissions.CanEditParcelProperties(avatar, this, 0)) + if (m_scene.Permissions.IsAdministrator(avatar)) return false; if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar)) @@ -463,7 +463,7 @@ namespace OpenSim.Region.CoreModules.World.Land if (e.AgentID == avatar && e.Flags == AccessList.Ban) return true; return false; - }) != -1) + }) != -1 && LandData.OwnerID != avatar) { return true; } @@ -473,7 +473,7 @@ namespace OpenSim.Region.CoreModules.World.Land public bool IsRestrictedFromLand(UUID avatar) { - if (m_scene.Permissions.CanEditParcelProperties(avatar, this, 0)) + if (m_scene.Permissions.IsAdministrator(avatar)) return false; if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar)) @@ -487,7 +487,7 @@ namespace OpenSim.Region.CoreModules.World.Land if (e.AgentID == avatar && e.Flags == AccessList.Access) return true; return false; - }) == -1) + }) == -1 && LandData.OwnerID != avatar) { if (!HasGroupAccess(avatar)) {