1 files changed, 20 insertions, 10 deletions

diff --git a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
index 3d563a6..506ad24 100644
--- a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
@@ -57,6 +57,7 @@ namespace OpenSim.Region.Framework.Scenes
         public int Height { get { return m_terrainData.SizeY; } } // Y dimension
         public int Altitude { get { return m_terrainData.SizeZ; } } // Y dimension
 
+
         // Default, not-often-used builder
         public TerrainChannel()
         {
@@ -157,7 +158,11 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (Double.IsNaN(value) || Double.IsInfinity(value))
                     return;
-
+                if (value < 0)
+                    value = 0;
+                else
+                    if (value > 655.35)
+                        value = 655.35;
                 m_terrainData[x, y] = (float)value;
             }
         }
@@ -363,8 +368,8 @@ namespace OpenSim.Region.Framework.Scenes
             public int SizeY;
             public int SizeZ;
             public float CompressionFactor;
-            public int[] Map;
-            public TerrainChannelXMLPackage(int pX, int pY, int pZ, float pCompressionFactor, int[] pMap)
+            public float[] Map;
+            public TerrainChannelXMLPackage(int pX, int pY, int pZ, float pCompressionFactor, float[] pMap)
             {
                 Version = 1;
                 SizeX = pX;
@@ -395,17 +400,22 @@ namespace OpenSim.Region.Framework.Scenes
         // Fill the heightmap with the center bump terrain
         private void PinHeadIsland()
         {
+            float cx = m_terrainData.SizeX * 0.5f;
+            float cy = m_terrainData.SizeY * 0.5f;
+            float h;
             for (int x = 0; x < Width; x++)
             {
                 for (int y = 0; y < Height; y++)
                 {
-                    m_terrainData[x, y] = (float)TerrainUtil.PerlinNoise2D(x, y, 2, 0.125) * 10;
-                    float spherFacA = (float)(TerrainUtil.SphericalFactor(x, y, m_terrainData.SizeX / 2.0, m_terrainData.SizeY / 2.0, 50) * 0.01d);
-                    float spherFacB = (float)(TerrainUtil.SphericalFactor(x, y, m_terrainData.SizeX / 2.0, m_terrainData.SizeY / 2.0, 100) * 0.001d);
-                    if (m_terrainData[x, y]< spherFacA)
-                        m_terrainData[x, y]= spherFacA;
-                    if (m_terrainData[x, y]< spherFacB)
-                        m_terrainData[x, y] = spherFacB;
+ //                   h = (float)TerrainUtil.PerlinNoise2D(x, y, 2, 0.125) * 10;
+                    h = 1.0f;
+                    float spherFacA = (float)(TerrainUtil.SphericalFactor(x, y, cx, cy, 50) * 0.01d);
+                    float spherFacB = (float)(TerrainUtil.SphericalFactor(x, y, cx, cy, 100) * 0.001d);
+                    if (h < spherFacA)
+                        h = spherFacA;
+                    if (h < spherFacB)
+                        h = spherFacB;
+                    m_terrainData[x, y] = h;
                 }
             }
         }