2 files changed, 6 insertions, 12 deletions

diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 3bde967..4cfa194 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -114,8 +114,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
             if (matureLevel <= 13)
                 m_scene.RegionInfo.RegionSettings.Maturity = 0;
-            else
+            else if (matureLevel <= 21)
                 m_scene.RegionInfo.RegionSettings.Maturity = 1;
+            else
+                m_scene.RegionInfo.RegionSettings.Maturity = 2;
 
             if (restrictPushObject)
                 m_scene.RegionInfo.RegionSettings.RestrictPushing = true;
@@ -580,11 +582,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
            args.redirectGridX = m_scene.RegionInfo.EstateSettings.RedirectGridX;
            args.redirectGridY = m_scene.RegionInfo.EstateSettings.RedirectGridY;
            args.regionFlags = GetRegionFlags();
-           byte mature = 13;
-           if (m_scene.RegionInfo.RegionSettings.Maturity == 1)
-              mature = 21;
-           args.simAccess = mature;
-
+           args.simAccess = m_scene.RegionInfo.AccessLevel;
            args.sunHour = (float)m_scene.RegionInfo.RegionSettings.SunPosition;
            args.terrainLowerLimit = (float)m_scene.RegionInfo.RegionSettings.TerrainLowerLimit;
            args.terrainRaiseLimit = (float)m_scene.RegionInfo.RegionSettings.TerrainRaiseLimit;
@@ -730,12 +728,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
             args.terrainHeightRange2 = (float)m_scene.RegionInfo.RegionSettings.Elevation2SE;
             args.terrainStartHeight3 = (float)m_scene.RegionInfo.RegionSettings.Elevation1NE;
             args.terrainHeightRange3 = (float)m_scene.RegionInfo.RegionSettings.Elevation2NE;
-            byte mature = 13;
-            if (m_scene.RegionInfo.RegionSettings.Maturity == 1)
-                mature = 21;
-            args.simAccess = mature;
+            args.simAccess = m_scene.RegionInfo.AccessLevel;
             args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight;
-
             args.regionFlags = GetRegionFlags();
             args.regionName = m_scene.RegionInfo.RegionName;
             if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 832b6cf..f4fe625 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 {
                     data = new MapBlockData();
                     data.Agents = 0;
-                    data.Access = 21; // TODO what's this?
+                    data.Access = info.AccessLevel;
                     data.MapImageId = info.RegionSettings.TerrainImageID;
                     data.Name = info.RegionName;
                     data.RegionFlags = 0; // TODO not used?