From c164be1ee56399a0c87ba5a70453a53f1d90e988 Mon Sep 17 00:00:00 2001 From: Melanie Date: Mon, 9 May 2011 01:12:21 +0200 Subject: [PATCH] Fix bans so the region owner and estate managers can't be banned by renters --- OpenSim/Region/CoreModules/World/Land/LandObject.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index fe6b83a878..0fbc93cacf 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs @@ -451,6 +451,9 @@ namespace OpenSim.Region.CoreModules.World.Land if (m_scene.Permissions.IsAdministrator(avatar)) return false; + if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar)) + return false; + if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0) { if (LandData.ParcelAccessList.FindIndex( @@ -472,6 +475,9 @@ namespace OpenSim.Region.CoreModules.World.Land if (m_scene.Permissions.IsAdministrator(avatar)) return false; + if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar)) + return false; + if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0) { if (LandData.ParcelAccessList.FindIndex(