From 3cfaf4c2251a4f10ecfd37377f2254b4032ffd10 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 22 Mar 2011 09:29:40 +0100
Subject: Adding a helper function lifted from Aurora. Not for core.

---
 OpenSim/Framework/EstateSettings.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'OpenSim/Framework/EstateSettings.cs')

diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index f9c13f3..37f6ed7 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -392,5 +392,14 @@ namespace OpenSim.Framework
 
             return l_EstateAccess.Contains(user);
         }
+
+        public void SetFromFlags(ulong regionFlags)
+        {
+            ResetHomeOnTeleport = ((regionFlags & (ulong)RegionFlags.ResetHomeOnTeleport) == (ulong)RegionFlags.ResetHomeOnTeleport);
+            BlockDwell = ((regionFlags & (ulong)RegionFlags.BlockDwell) == (ulong)RegionFlags.BlockDwell);
+            AllowLandmark = ((regionFlags & (ulong)RegionFlags.AllowLandmark) == (ulong)RegionFlags.AllowLandmark);
+            AllowParcelChanges = ((regionFlags & (ulong)RegionFlags.AllowParcelChanges) == (ulong)RegionFlags.AllowParcelChanges);
+            AllowSetHome = ((regionFlags & (ulong)RegionFlags.AllowSetHome) == (ulong)RegionFlags.AllowSetHome);
+        }
     }
 }
-- 
cgit v1.1


From c330f89fb1954ba2a784cd5bc421965b7594d60c Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 22 Mar 2011 10:43:43 +0100
Subject: Add some more fields to Estate settings and make them work. Run alter
 table estate_settings add column AllowLandmark tinyint not null default 1,
 add column AllowParcelChanges tinyint not null default 1, add column
 AllowSetHome tinyint not null default 1; to make this work.

---
 OpenSim/Framework/EstateSettings.cs | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'OpenSim/Framework/EstateSettings.cs')

diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 37f6ed7..afbdd49 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -58,6 +58,30 @@ namespace OpenSim.Framework
             set { m_EstateName = value; }
         }
 
+        private bool m_AllowLandmark = true;
+
+        public bool AllowLandmark
+        {
+            get { return m_AllowLandmark; }
+            set { m_AllowLandmark = value; }
+        }
+
+        private bool m_AllowParcelChanges = true;
+
+        public bool AllowParcelChanges
+        {
+            get { return m_AllowParcelChanges; }
+            set { m_AllowParcelChanges = value; }
+        }
+
+        private bool m_AllowSetHome = true;
+
+        public bool AllowSetHome
+        {
+            get { return m_AllowSetHome; }
+            set { m_AllowSetHome = value; }
+        }
+
         private uint m_ParentEstateID = 1;
 
         public uint ParentEstateID
-- 
cgit v1.1