aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-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 560b862..8c40171 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -418,7 +418,7 @@ namespace OpenSim.Region.CoreModules.World.Land
418 418
419 public bool IsBannedFromLand(UUID avatar) 419 public bool IsBannedFromLand(UUID avatar)
420 { 420 {
421 if (m_scene.Permissions.IsAdministrator(avatar)) 421 if (m_scene.Permissions.CanEditParcelProperties(avatar, this, 0))
422 return false; 422 return false;
423 423
424 if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0) 424 if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0)
@@ -429,7 +429,7 @@ namespace OpenSim.Region.CoreModules.World.Land
429 if (e.AgentID == avatar && e.Flags == AccessList.Ban) 429 if (e.AgentID == avatar && e.Flags == AccessList.Ban)
430 return true; 430 return true;
431 return false; 431 return false;
432 }) != -1 && LandData.OwnerID != avatar) 432 }) != -1)
433 { 433 {
434 return true; 434 return true;
435 } 435 }
@@ -439,7 +439,7 @@ namespace OpenSim.Region.CoreModules.World.Land
439 439
440 public bool IsRestrictedFromLand(UUID avatar) 440 public bool IsRestrictedFromLand(UUID avatar)
441 { 441 {
442 if (m_scene.Permissions.IsAdministrator(avatar)) 442 if (m_scene.Permissions.CanEditParcelProperties(avatar, this, 0))
443 return false; 443 return false;
444 444
445 if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0) 445 if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0)
@@ -450,7 +450,7 @@ namespace OpenSim.Region.CoreModules.World.Land
450 if (e.AgentID == avatar && e.Flags == AccessList.Access) 450 if (e.AgentID == avatar && e.Flags == AccessList.Access)
451 return true; 451 return true;
452 return false; 452 return false;
453 }) == -1 && LandData.OwnerID != avatar) 453 }) == -1)
454 { 454 {
455 return true; 455 return true;
456 } 456 }