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

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

This is patch http://opensimulator.org/mantis/view.php?id=5567
Thanks Snoopy!
bulletsim
Justin Clark-Casey (justincc) 2011-07-02 01:14:29 +01:00
parent bb4cb16512
commit b8e7258051
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

@ -418,7 +418,7 @@ namespace OpenSim.Region.CoreModules.World.Land
public bool IsBannedFromLand(UUID avatar) public bool IsBannedFromLand(UUID avatar)
{ {
if (m_scene.Permissions.IsAdministrator(avatar)) if (m_scene.Permissions.CanEditParcelProperties(avatar, this, 0))
return false; return false;
if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0) if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0)
@ -429,7 +429,7 @@ namespace OpenSim.Region.CoreModules.World.Land
if (e.AgentID == avatar && e.Flags == AccessList.Ban) if (e.AgentID == avatar && e.Flags == AccessList.Ban)
return true; return true;
return false; return false;
}) != -1 && LandData.OwnerID != avatar) }) != -1)
{ {
return true; return true;
} }
@ -439,7 +439,7 @@ namespace OpenSim.Region.CoreModules.World.Land
public bool IsRestrictedFromLand(UUID avatar) public bool IsRestrictedFromLand(UUID avatar)
{ {
if (m_scene.Permissions.IsAdministrator(avatar)) if (m_scene.Permissions.CanEditParcelProperties(avatar, this, 0))
return false; return false;
if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0) if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0)
@ -450,7 +450,7 @@ namespace OpenSim.Region.CoreModules.World.Land
if (e.AgentID == avatar && e.Flags == AccessList.Access) if (e.AgentID == avatar && e.Flags == AccessList.Access)
return true; return true;
return false; return false;
}) == -1 && LandData.OwnerID != avatar) }) == -1)
{ {
return true; return true;
} }