aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Land/LandObject.cs
diff options
context:
space:
mode:
authorMelanie2012-02-05 20:12:35 +0000
committerMelanie2012-02-05 20:12:35 +0000
commit0904772a6f14e4f03d199d8def063d6fb16414eb (patch)
treefdfb9ef9a73f1f938d6ec71134ff56093d360217 /OpenSim/Region/CoreModules/World/Land/LandObject.cs
parentMake configuration uniform (diff)
downloadopensim-SC_OLD-0904772a6f14e4f03d199d8def063d6fb16414eb.zip
opensim-SC_OLD-0904772a6f14e4f03d199d8def063d6fb16414eb.tar.gz
opensim-SC_OLD-0904772a6f14e4f03d199d8def063d6fb16414eb.tar.bz2
opensim-SC_OLD-0904772a6f14e4f03d199d8def063d6fb16414eb.tar.xz
Revert "Check ban list for a particular parcel only when an avatar moves into it."
This reverts commit 8923ad755d97d5ddb4a29cb6f543b53195f0b461.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandObject.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 9aff86c..d86d50e 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -418,6 +418,8 @@ namespace OpenSim.Region.CoreModules.World.Land
418 418
419 public bool IsBannedFromLand(UUID avatar) 419 public bool IsBannedFromLand(UUID avatar)
420 { 420 {
421// ExpireAccessList();
422//
421 if (m_scene.Permissions.IsAdministrator(avatar)) 423 if (m_scene.Permissions.IsAdministrator(avatar))
422 return false; 424 return false;
423 425
@@ -445,6 +447,8 @@ namespace OpenSim.Region.CoreModules.World.Land
445 447
446 public bool IsRestrictedFromLand(UUID avatar) 448 public bool IsRestrictedFromLand(UUID avatar)
447 { 449 {
450// ExpireAccessList();
451//
448 if (m_scene.Permissions.IsAdministrator(avatar)) 452 if (m_scene.Permissions.IsAdministrator(avatar))
449 return false; 453 return false;
450 454