1 files changed, 10 insertions, 7 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 8edd169..30a64c7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2686,7 +2686,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public double llWater(LSL_Types.Vector3 offset)
         {
             m_host.AddScriptLPS(1);
-            return World.RegionInfo.EstateSettings.waterHeight;
+            return World.RegionInfo.RegionSettings.WaterHeight;
         }
 
         public void llPassTouches(int pass)
@@ -6235,10 +6235,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     case 7: // DATA_SIM_RATING
                         if (info == null)
                             return LLUUID.Zero.ToString();
-                        int access = (int)info.EstateSettings.simAccess;
-                        if (access == 21)
-                            reply = "MATURE";
-                        else if (access == 13)
+                        int access = info.RegionSettings.Maturity;
+                        if (access == 0)
+                            reply = "PG";
+                        else if (access == 1)
                             reply = "MATURE";
                         else
                             reply = "UNKNOWN";
@@ -6609,7 +6609,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Types.LSLInteger llGetRegionFlags()
         {
             m_host.AddScriptLPS(1);
-            return (int)World.RegionInfo.EstateSettings.regionFlags;
+            IEstateModule estate = World.RequestModuleInterface<IEstateModule>();
+            if(estate == null)
+                return 67108864;
+            return (int)estate.GetRegionFlags();
         }
 
         public string llXorBase64StringsCorrect(string str1, string str2)
@@ -6786,7 +6789,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // Which probably will be irrelevent in OpenSim....
             LandData land = World.GetLandData((float)pos.x, (float)pos.y);
 
-            float bonusfactor = World.RegionInfo.EstateSettings.objectBonusFactor;
+            float bonusfactor = (float)World.RegionInfo.RegionSettings.ObjectBonus;
 
             if (land == null)
             {