From a5fcdde179f41d09e0ff94f23fd84f1766457e69 Mon Sep 17 00:00:00 2001 From: Melanie Date: Sun, 5 Feb 2012 20:12:45 +0000 Subject: Revert "Remove checks on ban list expiry on every move. To be re-added on parcel" This reverts commit 35f14a262dfa3d9199f554154a63f5f532460f56. --- OpenSim/Region/CoreModules/World/Land/LandObject.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/CoreModules/World/Land') diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index d86d50e..3b4336f 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs @@ -418,8 +418,8 @@ namespace OpenSim.Region.CoreModules.World.Land public bool IsBannedFromLand(UUID avatar) { -// ExpireAccessList(); -// + ExpireAccessList(); + if (m_scene.Permissions.IsAdministrator(avatar)) return false; @@ -447,8 +447,8 @@ namespace OpenSim.Region.CoreModules.World.Land public bool IsRestrictedFromLand(UUID avatar) { -// ExpireAccessList(); -// + ExpireAccessList(); + if (m_scene.Permissions.IsAdministrator(avatar)) return false; -- cgit v1.1