OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bans so the region owner and estate managers can't be banned by renters

avinationmerge
Melanie 2011-05-09 01:12:21 +02:00
parent d511c1e355
commit c164be1ee5
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@ -451,6 +451,9 @@ namespace OpenSim.Region.CoreModules.World.Land
if (m_scene.Permissions.IsAdministrator(avatar)) if (m_scene.Permissions.IsAdministrator(avatar))
return false; return false;
if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar))
return false;
if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0) if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0)
{ {
if (LandData.ParcelAccessList.FindIndex( if (LandData.ParcelAccessList.FindIndex(
@ -472,6 +475,9 @@ namespace OpenSim.Region.CoreModules.World.Land
if (m_scene.Permissions.IsAdministrator(avatar)) if (m_scene.Permissions.IsAdministrator(avatar))
return false; return false;
if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar))
return false;
if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0) if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0)
{ {
if (LandData.ParcelAccessList.FindIndex( if (LandData.ParcelAccessList.FindIndex(