add 2 minor speedups on allow parcel owner more restrive checks

master
UbitUmarov 2020-05-21 21:55:23 +01:00
parent 35b0b77656
commit 6e0d82f584
1 changed files with 6 additions and 0 deletions

View File

@ -635,6 +635,9 @@ namespace OpenSim.Region.CoreModules.World.Land
public bool IsEitherBannedOrRestricted(UUID avatar) public bool IsEitherBannedOrRestricted(UUID avatar)
{ {
if (m_scene.RegionInfo.EstateSettings.TaxFree) // region access control only
return false;
if (IsBannedFromLand(avatar)) if (IsBannedFromLand(avatar))
{ {
return true; return true;
@ -648,6 +651,9 @@ namespace OpenSim.Region.CoreModules.World.Land
public bool CanBeOnThisLand(UUID avatar, float posHeight) public bool CanBeOnThisLand(UUID avatar, float posHeight)
{ {
if (m_scene.RegionInfo.EstateSettings.TaxFree) // region access control only
return true;
if (posHeight < m_scene.LandChannel.BanLineSafeHeight && IsBannedFromLand(avatar)) if (posHeight < m_scene.LandChannel.BanLineSafeHeight && IsBannedFromLand(avatar))
{ {
return false; return false;