1 files changed, 56 insertions, 54 deletions

diff --git a/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs b/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs
index 01f6bdf..1344715 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs
@@ -35,34 +35,70 @@ namespace OpenSim.Region.Environment.Modules.Terrain
     /// </summary>
     public class TerrainChannel : ITerrainChannel
     {
+        private readonly bool[,] taint;
         private double[,] map;
-        private bool[,] taint;
 
-        public int Width
+        public TerrainChannel()
         {
-            get { return map.GetLength(0); }
+            map = new double[Constants.RegionSize,Constants.RegionSize];
+            taint = new bool[Constants.RegionSize / 16,Constants.RegionSize / 16];
+
+            int x;
+            for (x = 0; x < Constants.RegionSize; x++)
+            {
+                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, Constants.RegionSize / 2, 50) * 0.01;
+                    if (map[x, y] < spherFac)
+                    {
+                        map[x, y] = spherFac;
+                    }
+                }
+            }
         }
 
-        public int Height
+        public TerrainChannel(double[,] import)
         {
-            get { return map.GetLength(1); }
+            map = import;
+            taint = new bool[import.GetLength(0),import.GetLength(1)];
         }
 
-        public TerrainChannel Copy()
+        public TerrainChannel(bool createMap)
         {
-            TerrainChannel copy = new TerrainChannel(false);
-            copy.map = (double[,])this.map.Clone();
+            if (createMap)
+            {
+                map = new double[Constants.RegionSize,Constants.RegionSize];
+                taint = new bool[Constants.RegionSize / 16,Constants.RegionSize / 16];
+            }
+        }
 
-            return copy;
+        public TerrainChannel(int w, int h)
+        {
+            map = new double[w,h];
+            taint = new bool[w / 16,h / 16];
+        }
+
+        #region ITerrainChannel Members
+
+        public int Width
+        {
+            get { return map.GetLength(0); }
+        }
+
+        public int Height
+        {
+            get { return map.GetLength(1); }
         }
 
         public ITerrainChannel MakeCopy()
         {
             TerrainChannel copy = new TerrainChannel(false);
-            copy.map = (double[,])this.map.Clone();
+            copy.map = (double[,]) map.Clone();
 
             return copy;
-        } 
+        }
 
         public float[] GetFloatsSerialised()
         {
@@ -71,7 +107,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
 
             for (i = 0; i < Width * Height; i++)
             {
-                heights[i] = (float)map[i % Width, i / Width];
+                heights[i] = (float) map[i % Width, i / Width];
             }
 
             return heights;
@@ -84,10 +120,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
 
         public double this[int x, int y]
         {
-            get
-            {
-                return map[x, y];
-            }
+            get { return map[x, y]; }
             set
             {
                 if (map[x, y] != value)
@@ -100,7 +133,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
 
         public bool Tainted(int x, int y)
         {
-            if (taint[x / 16, y / 16] != false)
+            if (taint[x / 16, y / 16])
             {
                 taint[x / 16, y / 16] = false;
                 return true;
@@ -111,45 +144,14 @@ namespace OpenSim.Region.Environment.Modules.Terrain
             }
         }
 
-        public TerrainChannel()
-        {
-            map = new double[Constants.RegionSize, Constants.RegionSize];
-            taint = new bool[Constants.RegionSize / 16, Constants.RegionSize / 16];
+        #endregion
 
-            int x, y;
-            for (x = 0; x < Constants.RegionSize; x++)
-            {
-                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, Constants.RegionSize / 2, 50) * 0.01;
-                    if (map[x, y] < spherFac)
-                    {
-                        map[x, y] = spherFac;
-                    }
-                }
-            }
-        }
-
-        public TerrainChannel(double[,] import)
-        {
-            map = import;
-            taint = new bool[import.GetLength(0), import.GetLength(1)];
-        }
-
-        public TerrainChannel(bool createMap)
+        public TerrainChannel Copy()
         {
-            if (createMap)
-            {
-                map = new double[Constants.RegionSize, Constants.RegionSize];
-                taint = new bool[Constants.RegionSize / 16, Constants.RegionSize / 16];
-            }
-        }
+            TerrainChannel copy = new TerrainChannel(false);
+            copy.map = (double[,]) map.Clone();
 
-        public TerrainChannel(int w, int h)
-        {
-            map = new double[w, h];
-            taint = new bool[w / 16, h / 16];
+            return copy;
         }
     }
-}
+}
\ No newline at end of file