diff options
author | Melanie | 2011-05-09 01:12:21 +0200 |
---|---|---|
committer | Melanie | 2011-05-09 01:12:21 +0200 |
commit | c164be1ee56399a0c87ba5a70453a53f1d90e988 (patch) | |
tree | f12a5d31a1f91a6b82db2b39e188dbee688504a2 /OpenSim/Region/CoreModules/World/Land/LandObject.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC_OLD-c164be1ee56399a0c87ba5a70453a53f1d90e988.zip opensim-SC_OLD-c164be1ee56399a0c87ba5a70453a53f1d90e988.tar.gz opensim-SC_OLD-c164be1ee56399a0c87ba5a70453a53f1d90e988.tar.bz2 opensim-SC_OLD-c164be1ee56399a0c87ba5a70453a53f1d90e988.tar.xz |
Fix bans so the region owner and estate managers can't be banned by renters
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandObject.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index fe6b83a..0fbc93c 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -451,6 +451,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
451 | if (m_scene.Permissions.IsAdministrator(avatar)) | 451 | if (m_scene.Permissions.IsAdministrator(avatar)) |
452 | return false; | 452 | return false; |
453 | 453 | ||
454 | if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar)) | ||
455 | return false; | ||
456 | |||
454 | if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0) | 457 | if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0) |
455 | { | 458 | { |
456 | if (LandData.ParcelAccessList.FindIndex( | 459 | if (LandData.ParcelAccessList.FindIndex( |
@@ -472,6 +475,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
472 | if (m_scene.Permissions.IsAdministrator(avatar)) | 475 | if (m_scene.Permissions.IsAdministrator(avatar)) |
473 | return false; | 476 | return false; |
474 | 477 | ||
478 | if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar)) | ||
479 | return false; | ||
480 | |||
475 | if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0) | 481 | if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0) |
476 | { | 482 | { |
477 | if (LandData.ParcelAccessList.FindIndex( | 483 | if (LandData.ParcelAccessList.FindIndex( |