aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index 7ca1f3a..44f9a93 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -60,7 +60,8 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
60 m_scene.RegionInfo.EstateSettings.ParentEstateID, 60 m_scene.RegionInfo.EstateSettings.ParentEstateID,
61 GetEstateFlags(), 61 GetEstateFlags(),
62 sun, 62 sun,
63 m_scene.RegionInfo.RegionSettings.Covenant); 63 m_scene.RegionInfo.RegionSettings.Covenant,
64 m_scene.RegionInfo.EstateSettings.AbuseEmail);
64 65
65 remote_client.SendEstateManagersList(invoice, 66 remote_client.SendEstateManagersList(invoice,
66 m_scene.RegionInfo.EstateSettings.EstateManagers, 67 m_scene.RegionInfo.EstateSettings.EstateManagers,
@@ -628,6 +629,11 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
628 else 629 else
629 m_scene.RegionInfo.EstateSettings.DenyTransacted = false; 630 m_scene.RegionInfo.EstateSettings.DenyTransacted = false;
630 631
632 if ((parms1 & 0x40000000) != 0)
633 m_scene.RegionInfo.EstateSettings.DenyMinors = true;
634 else
635 m_scene.RegionInfo.EstateSettings.DenyMinors = false;
636
631 m_scene.RegionInfo.EstateSettings.Save(); 637 m_scene.RegionInfo.EstateSettings.Save();
632 638
633 float sun = (float)m_scene.RegionInfo.RegionSettings.SunPosition; 639 float sun = (float)m_scene.RegionInfo.RegionSettings.SunPosition;
@@ -797,6 +803,8 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
797 flags |= Simulator.RegionFlags.ResetHomeOnTeleport; 803 flags |= Simulator.RegionFlags.ResetHomeOnTeleport;
798 if (m_scene.RegionInfo.EstateSettings.TaxFree) 804 if (m_scene.RegionInfo.EstateSettings.TaxFree)
799 flags |= Simulator.RegionFlags.TaxFree; 805 flags |= Simulator.RegionFlags.TaxFree;
806 if (m_scene.RegionInfo.EstateSettings.DenyMinors)
807 flags |= (Simulator.RegionFlags)(1 << 30);
800 808
801 return (uint)flags; 809 return (uint)flags;
802 } 810 }