4 files changed, 16 insertions, 24 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index a78ad98..36a0ffc 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -297,24 +297,11 @@ namespace OpenSim.Region.Environment.Scenes
             m_httpListener = httpServer;
             m_dumpAssetsToFile = dumpAssetsToFile;
 
-            if ((RegionInfo.EstateSettings.regionFlags & Simulator.RegionFlags.SkipScripts) == Simulator.RegionFlags.SkipScripts)
-            {
-                m_scripts_enabled = false;
-            }
-            else
-            {
-                m_scripts_enabled = true;
-            }
-            if ((RegionInfo.EstateSettings.regionFlags & Simulator.RegionFlags.SkipPhysics) == Simulator.RegionFlags.SkipPhysics)
-            {
-                m_physics_enabled = false;
-            }
-            else
-            {
-                m_physics_enabled = true;
-            }
+            m_scripts_enabled = !RegionInfo.RegionSettings.DisableScripts;
+
+            m_physics_enabled = !RegionInfo.RegionSettings.DisablePhysics;
 
-            m_statsReporter = new SimStatsReporter(regInfo);
+            m_statsReporter = new SimStatsReporter(this);
             m_statsReporter.OnSendStatsResult += SendSimStatsPackets;
 
             m_statsReporter.SetObjectCapacity(objectCapacity);
@@ -1076,7 +1063,7 @@ namespace OpenSim.Region.Environment.Scenes
                         //float tmpval = (float)hm[x, y];
                         float heightvalue = (float)hm[x, y];
 
-                        if ((float)heightvalue > m_regInfo.EstateSettings.waterHeight)
+                        if (heightvalue > (float)m_regInfo.RegionSettings.WaterHeight)
                         {
                             // scale height value
                             heightvalue = low + mid * (heightvalue - low) / mid;
@@ -1110,7 +1097,7 @@ namespace OpenSim.Region.Environment.Scenes
                         else
                         {
                             // Y flip the cordinates
-                            heightvalue = m_regInfo.EstateSettings.waterHeight - heightvalue;
+                            heightvalue = (float)m_regInfo.RegionSettings.WaterHeight - heightvalue;
                             if (heightvalue > 19)
                                 heightvalue = 19;
                             if (heightvalue < 0)
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
index 8feb852..0696432 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Environment.Scenes
         public void CreateScriptInstances(int startParam, bool postOnRez)
         {
             // Don't start scripts if they're turned off in the region!
-            if (!((m_scene.RegionInfo.EstateSettings.regionFlags & Simulator.RegionFlags.SkipScripts) == Simulator.RegionFlags.SkipScripts))
+            if (!m_scene.RegionInfo.RegionSettings.DisableScripts)
             {
                 foreach (SceneObjectPart part in m_parts.Values)
                 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index d407392..841b7b6 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -173,7 +173,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             AddFlag(LLObject.ObjectFlags.Scripted);
 
-            if (!((m_parentGroup.Scene.RegionInfo.EstateSettings.regionFlags & Simulator.RegionFlags.SkipScripts) == Simulator.RegionFlags.SkipScripts))
+            if (!m_parentGroup.Scene.RegionInfo.RegionSettings.DisableScripts)
             {
                 AssetCache cache = m_parentGroup.Scene.AssetCache;
 
diff --git a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
index 90a971f..609b4ed 100644
--- a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
@@ -29,6 +29,7 @@ using System;
 using System.Timers;
 using libsecondlife.Packets;
 using OpenSim.Framework;
+using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -104,16 +105,19 @@ namespace OpenSim.Region.Environment.Scenes
         SimStatsPacket statpack = (SimStatsPacket)PacketPool.Instance.GetPacket(PacketType.SimStats);
 
 
+        private Scene m_scene;
+
         private RegionInfo ReportingRegion;
 
         private Timer m_report = new Timer();
 
 
-        public SimStatsReporter(RegionInfo regionData)
+        public SimStatsReporter(Scene scene)
         {
 
             statsUpdateFactor = (float)(statsUpdatesEveryMS / 1000);
-            ReportingRegion = regionData;
+            m_scene = scene;
+            ReportingRegion = scene.RegionInfo;
             for (int i = 0; i<21;i++)
             {
                 sb[i] = new SimStatsPacket.StatBlock();
@@ -145,7 +149,8 @@ namespace OpenSim.Region.Environment.Scenes
                 statpack.Region.RegionY = ReportingRegion.RegionLocY;
                 try
                 {
-                    statpack.Region.RegionFlags = (uint) ReportingRegion.EstateSettings.regionFlags;
+                    IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>();
+                    statpack.Region.RegionFlags = estateModule.GetRegionFlags();
                 }
                 catch (Exception)
                 {