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

Revert "If a user has the rights to edit a parcel's properties, then also allow them always to enter that parcel." 

This reverts commit b8e7258051.

Letting this go in would prevent land owners from banning someone who would
have incidental editing rights through a group. The land owner should be the
only unbannable person.
avinationmerge
root 2011-07-05 04:02:16 +01:00
parent 47cf9c8fe0
commit f45746613d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -449,7 +449,7 @@ namespace OpenSim.Region.CoreModules.World.Land
public bool IsBannedFromLand(UUID avatar)
{
if (m_scene.Permissions.CanEditParcelProperties(avatar, this, 0))
if (m_scene.Permissions.IsAdministrator(avatar))
return false;
if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar))
@ -463,7 +463,7 @@ namespace OpenSim.Region.CoreModules.World.Land
if (e.AgentID == avatar && e.Flags == AccessList.Ban)
return true;
return false;
}) != -1)
}) != -1 && LandData.OwnerID != avatar)
{
return true;
}
@ -473,7 +473,7 @@ namespace OpenSim.Region.CoreModules.World.Land
public bool IsRestrictedFromLand(UUID avatar)
{
if (m_scene.Permissions.CanEditParcelProperties(avatar, this, 0))
if (m_scene.Permissions.IsAdministrator(avatar))
return false;
if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar))
@ -487,7 +487,7 @@ namespace OpenSim.Region.CoreModules.World.Land
if (e.AgentID == avatar && e.Flags == AccessList.Access)
return true;
return false;
}) == -1)
}) == -1 && LandData.OwnerID != avatar)
{
if (!HasGroupAccess(avatar))
{