From 9f1c0337572b4eb3814cd634dd25148be7de864c Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Fri, 9 May 2008 03:19:20 +0000
Subject: * Minor tweak to TerrainChannel * Minor tweak to
 Permissions/PermissionsModule.cs

---
 .../Modules/World/Permissions/PermissionsModule.cs          |  2 +-
 .../Environment/Modules/World/Terrain/TerrainChannel.cs     | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index 16cd211..4e31ae6 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
             return false;
         }
 
-        public bool IsEstateManager(LLUUID user)
+        protected bool IsEstateManager(LLUUID user)
         {
             if (m_bypassPermissions)
             {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
index 305818f..1399960 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
@@ -49,12 +49,13 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
                 int y;
                 for (y = 0; y < Constants.RegionSize; y++)
                 {
-                    map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 10;
-                    double spherFac = TerrainUtil.SphericalFactor(x, y, Constants.RegionSize / 2.0, Constants.RegionSize / 2.0, 50) * 0.01;
-                    if (map[x, y] < spherFac)
-                    {
-                        map[x, y] = spherFac;
-                    }
+                    map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 2, 0.125) * 10;
+                    double spherFacA = TerrainUtil.SphericalFactor(x, y, Constants.RegionSize / 2.0, Constants.RegionSize / 2.0, 50) * 0.01;
+                    double spherFacB = TerrainUtil.SphericalFactor(x, y, Constants.RegionSize / 2.0, Constants.RegionSize / 2.0, 100) * 0.001;
+                    if (map[x, y] < spherFacA)
+                        map[x, y] = spherFacA;
+                    if (map[x, y] < spherFacB)
+                        map[x, y] = spherFacB;
                 }
             }
         }
-- 
cgit v1.1