mirror of
https://github.com/opensim/opensim.git
synced 2026-08-05 08:55:56 +08:00
Estate series, patch 9 (#9157)
Adds the new access semantics and the new flag (allow only age verified) Plumbs in the abuse email address from sim to viewer. The other way around, libomv appears to be lacking support for the data field in the packet. Includes a migration, run prebuild!
This commit is contained in:
@@ -60,7 +60,8 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
|
||||
m_scene.RegionInfo.EstateSettings.ParentEstateID,
|
||||
GetEstateFlags(),
|
||||
sun,
|
||||
m_scene.RegionInfo.RegionSettings.Covenant);
|
||||
m_scene.RegionInfo.RegionSettings.Covenant,
|
||||
m_scene.RegionInfo.EstateSettings.AbuseEmail);
|
||||
|
||||
remote_client.SendEstateManagersList(invoice,
|
||||
m_scene.RegionInfo.EstateSettings.EstateManagers,
|
||||
@@ -628,6 +629,11 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
|
||||
else
|
||||
m_scene.RegionInfo.EstateSettings.DenyTransacted = false;
|
||||
|
||||
if ((parms1 & 0x40000000) != 0)
|
||||
m_scene.RegionInfo.EstateSettings.DenyMinors = true;
|
||||
else
|
||||
m_scene.RegionInfo.EstateSettings.DenyMinors = false;
|
||||
|
||||
m_scene.RegionInfo.EstateSettings.Save();
|
||||
|
||||
float sun = (float)m_scene.RegionInfo.RegionSettings.SunPosition;
|
||||
@@ -797,6 +803,8 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
|
||||
flags |= Simulator.RegionFlags.ResetHomeOnTeleport;
|
||||
if (m_scene.RegionInfo.EstateSettings.TaxFree)
|
||||
flags |= Simulator.RegionFlags.TaxFree;
|
||||
if (m_scene.RegionInfo.EstateSettings.DenyMinors)
|
||||
flags |= (Simulator.RegionFlags)(1 << 30);
|
||||
|
||||
return (uint)flags;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user