aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-01 21:08:00 +0000
committerMelanie Thielker2008-08-01 21:08:00 +0000
commit12c5bfa3e0f42232035d74b3768ea98211dc5e18 (patch)
treec7dbdacf918345872ff633d282951b40797e04ff /OpenSim/Region/Environment
parent* minor: add to the thread tracker the thread with which the thread tracker t... (diff)
downloadopensim-SC_OLD-12c5bfa3e0f42232035d74b3768ea98211dc5e18.zip
opensim-SC_OLD-12c5bfa3e0f42232035d74b3768ea98211dc5e18.tar.gz
opensim-SC_OLD-12c5bfa3e0f42232035d74b3768ea98211dc5e18.tar.bz2
opensim-SC_OLD-12c5bfa3e0f42232035d74b3768ea98211dc5e18.tar.xz
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!
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs10
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs2
2 files changed, 10 insertions, 2 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 }
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index 357e454..4c28361 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -781,7 +781,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
781 public void SendEstateCovenantInformation(LLUUID covenant) 781 public void SendEstateCovenantInformation(LLUUID covenant)
782 { 782 {
783 } 783 }
784 public void SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, LLUUID covenant) 784 public void SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, LLUUID covenant, string abuseEmail)
785 { 785 {
786 } 786 }
787 787