diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 8 |
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 04b20d4..2a6d362 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -449,7 +449,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
449 | 449 | ||
450 | public bool IsBannedFromLand(UUID avatar) | 450 | public bool IsBannedFromLand(UUID avatar) |
451 | { | 451 | { |
452 | if (m_scene.Permissions.CanEditParcelProperties(avatar, this, 0)) | 452 | if (m_scene.Permissions.IsAdministrator(avatar)) |
453 | return false; | 453 | return false; |
454 | 454 | ||
455 | if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar)) | 455 | if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar)) |
@@ -463,7 +463,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
463 | if (e.AgentID == avatar && e.Flags == AccessList.Ban) | 463 | if (e.AgentID == avatar && e.Flags == AccessList.Ban) |
464 | return true; | 464 | return true; |
465 | return false; | 465 | return false; |
466 | }) != -1) | 466 | }) != -1 && LandData.OwnerID != avatar) |
467 | { | 467 | { |
468 | return true; | 468 | return true; |
469 | } | 469 | } |
@@ -473,7 +473,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
473 | 473 | ||
474 | public bool IsRestrictedFromLand(UUID avatar) | 474 | public bool IsRestrictedFromLand(UUID avatar) |
475 | { | 475 | { |
476 | if (m_scene.Permissions.CanEditParcelProperties(avatar, this, 0)) | 476 | if (m_scene.Permissions.IsAdministrator(avatar)) |
477 | return false; | 477 | return false; |
478 | 478 | ||
479 | if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar)) | 479 | if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar)) |
@@ -487,7 +487,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
487 | if (e.AgentID == avatar && e.Flags == AccessList.Access) | 487 | if (e.AgentID == avatar && e.Flags == AccessList.Access) |
488 | return true; | 488 | return true; |
489 | return false; | 489 | return false; |
490 | }) == -1) | 490 | }) == -1 && LandData.OwnerID != avatar) |
491 | { | 491 | { |
492 | if (!HasGroupAccess(avatar)) | 492 | if (!HasGroupAccess(avatar)) |
493 | { | 493 | { |