aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-02-05 20:12:45 +0000
committerMelanie2012-02-05 20:12:45 +0000
commita5fcdde179f41d09e0ff94f23fd84f1766457e69 (patch)
treeaeab95409e175243de9e0db0f793e0022d924b5d
parentRevert "Check ban list for a particular parcel only when an avatar moves into... (diff)
downloadopensim-SC_OLD-a5fcdde179f41d09e0ff94f23fd84f1766457e69.zip
opensim-SC_OLD-a5fcdde179f41d09e0ff94f23fd84f1766457e69.tar.gz
opensim-SC_OLD-a5fcdde179f41d09e0ff94f23fd84f1766457e69.tar.bz2
opensim-SC_OLD-a5fcdde179f41d09e0ff94f23fd84f1766457e69.tar.xz
Revert "Remove checks on ban list expiry on every move. To be re-added on parcel"
This reverts commit 35f14a262dfa3d9199f554154a63f5f532460f56.
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs8
1 files changed, 4 insertions, 4 deletions
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
418 418
419 public bool IsBannedFromLand(UUID avatar) 419 public bool IsBannedFromLand(UUID avatar)
420 { 420 {
421// ExpireAccessList(); 421 ExpireAccessList();
422// 422
423 if (m_scene.Permissions.IsAdministrator(avatar)) 423 if (m_scene.Permissions.IsAdministrator(avatar))
424 return false; 424 return false;
425 425
@@ -447,8 +447,8 @@ namespace OpenSim.Region.CoreModules.World.Land
447 447
448 public bool IsRestrictedFromLand(UUID avatar) 448 public bool IsRestrictedFromLand(UUID avatar)
449 { 449 {
450// ExpireAccessList(); 450 ExpireAccessList();
451// 451
452 if (m_scene.Permissions.IsAdministrator(avatar)) 452 if (m_scene.Permissions.IsAdministrator(avatar))
453 return false; 453 return false;
454 454