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

Estate age and payment (anonimous) access control override parcel settings. Enforce it at parcel level (a bit heavy for now, needs revison)

master
UbitUmarov 2020-01-11 16:26:56 +00:00
parent b9e74dd504
commit c2cef470f5
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -565,6 +565,20 @@ namespace OpenSim.Region.CoreModules.World.Land
ParcelFlags.DenyAgeUnverified); ParcelFlags.DenyAgeUnverified);
} }
} }
// enforce estate age and payinfo limitations
if (m_scene.RegionInfo.EstateSettings.DenyMinors)
{
args.ParcelFlags |= (uint)ParcelFlags.DenyAgeUnverified;
allowedDelta |= (uint)ParcelFlags.DenyAgeUnverified;
}
if (m_scene.RegionInfo.EstateSettings.DenyAnonymous)
{
args.ParcelFlags |= (uint)ParcelFlags.DenyAnonymous;
allowedDelta |= (uint)ParcelFlags.DenyAnonymous;
}
if (allowedDelta != (uint)ParcelFlags.None) if (allowedDelta != (uint)ParcelFlags.None)
{ {
uint preserve = LandData.Flags & ~allowedDelta; uint preserve = LandData.Flags & ~allowedDelta;
@ -727,7 +741,21 @@ namespace OpenSim.Region.CoreModules.World.Land
return false; return false;
if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) == 0) if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) == 0)
{
bool adults = m_scene.RegionInfo.EstateSettings.DoDenyMinors &&
(m_scene.RegionInfo.EstateSettings.DenyMinors || ((LandData.Flags & (uint)ParcelFlags.DenyAgeUnverified) != 0));
bool anonymous = m_scene.RegionInfo.EstateSettings.DoDenyAnonymous &&
(m_scene.RegionInfo.EstateSettings.DenyAnonymous || ((LandData.Flags & (uint)ParcelFlags.DenyAnonymous) != 0));
if(adults || anonymous)
{
int userflags = m_scene.GetUserFlags(avatar); // this is heavy
if(adults && ((userflags & 32) == 0))
return true;
if(anonymous && ((userflags & 4) == 0))
return true;
}
return false; return false;
}
if (m_scene.Permissions.IsAdministrator(avatar)) if (m_scene.Permissions.IsAdministrator(avatar))
return false; return false;