From 0e789a9a0145b372a1337319ca468636515dc254 Mon Sep 17 00:00:00 2001
From: MW
Date: Wed, 2 Apr 2008 11:03:44 +0000
Subject: Set default terrain to complete flat terrain (at 26 height). Even
 flat terrain as default seems better than the messed up terrain I was
 getting.

---
 OpenSim/Grid/AssetServer/Main.cs                            |  2 +-
 .../Region/Environment/Modules/Terrain/TerrainChannel.cs    | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index c863c76..3a38e85 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Grid.AssetServer
             }
         }
 
-        private OpenAsset_Main()
+        public OpenAsset_Main()
         {
             m_console = new ConsoleBase("OpenAsset", this);
             
diff --git a/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs b/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs
index 74af2c1..6e1a5d6 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs
@@ -121,12 +121,13 @@ namespace OpenSim.Region.Environment.Modules.Terrain
             {
                 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, Constants.RegionSize, 20);
-                    if (map[x, y] < spherFac)
-                    {
-                        map[x, y] = spherFac;
-                    }
+                    //map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 10;
+                   // double spherFac = TerrainUtil.SphericalFactor(x, y, Constants.RegionSize, Constants.RegionSize, 20);
+                   // if (map[x, y] < spherFac)
+                   // {
+                   //     map[x, y] = spherFac;
+                   // }
+                    map[x, y] = 26;
                 }
             }
         }
-- 
cgit v1.1