* Terrain Module code has been reformatted to comply with guidelines.

* Fixed a variety of code quality issues. (Yes, I've found ReSharper.)

9 files changed, 53 insertions, 52 deletions

diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/ErodeSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/ErodeSphere.cs
index a8942dc..cfb1f60 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/ErodeSphere.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/ErodeSphere.cs
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Region.Environment.Interfaces;
 using System;
+using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
 {
@@ -35,18 +35,12 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
     /// </summary>
     public class ErodeSphere : ITerrainPaintableEffect
     {
-        NeighbourSystem type = NeighbourSystem.Moore; // Parameter
-
-        double rainHeight = 0.2;
-        int rounds = 10;
-        double waterSaturation = 0.30; // Can carry 1% of water in height
+        private double rainHeight = 0.2;
+        private int rounds = 10;
+        private NeighbourSystem type = NeighbourSystem.Moore; // Parameter
+        private double waterSaturation = 0.30; // Can carry 1% of water in height
 
         #region Supporting Functions
-        private enum NeighbourSystem
-        {
-            Moore,
-            VonNeumann
-        } ;
 
         private int[] Neighbours(NeighbourSystem type, int index)
         {
@@ -146,6 +140,12 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
             return coord;
         }
 
+        private enum NeighbourSystem
+        {
+            Moore,
+            VonNeumann
+        } ;
+
         #endregion
 
         #region ITerrainPaintableEffect Members
@@ -266,7 +266,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
                                 // Calculate how much water we can move
                                 double waterMin = Math.Min(water[x, y], altitudeDelta);
                                 double waterDelta = waterMin * ((water[coords[0], coords[1]] + map[coords[0], coords[1]])
-                                    / altitudeTotal);
+                                                                / altitudeTotal);
 
                                 double sedimentDelta = sediment[x, y] * (waterDelta / water[x, y]);
 
@@ -309,4 +309,4 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
 
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs
index 9bfb981..d907ed2 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs
@@ -31,12 +31,6 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
 {
     public class FlattenSphere : ITerrainPaintableEffect
     {
-        private double SphericalFactor(double x, double y, double rx, double ry, double size)
-        {
-            double z = size * size - ((x - rx) * (x - rx) + (y - ry) * (y - ry));
-            return z;
-        }
-
 // TODO: unused
 //         private double GetBilinearInterpolate(double x, double y, ITerrainChannel map)
 //         {
@@ -78,7 +72,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
             strength = TerrainUtil.MetersToSphericalStrength(strength);
 
             int x, y;
-            double[,] tweak = new double[map.Width, map.Height];
+            double[,] tweak = new double[map.Width,map.Height];
 
             double area = strength;
             double step = strength / 4.0;
@@ -123,5 +117,11 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
         }
 
         #endregion
+
+        private double SphericalFactor(double x, double y, double rx, double ry, double size)
+        {
+            double z = size * size - ((x - rx) * (x - rx) + (y - ry) * (y - ry));
+            return z;
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/LowerSphere.cs
index 9185b5d..ead1a49 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/LowerSphere.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/LowerSphere.cs
@@ -64,4 +64,4 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
 
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/NoiseSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/NoiseSphere.cs
index 9b45b34..e3babbf 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/NoiseSphere.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/NoiseSphere.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
                     z *= z;
                     z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
 
-                    double noise = TerrainUtil.PerlinNoise2D((double)x / (double)Framework.Constants.RegionSize, (double)y / (double)Framework.Constants.RegionSize, 8, 1.0);
+                    double noise = TerrainUtil.PerlinNoise2D((double) x / (double) Constants.RegionSize, (double) y / (double) Constants.RegionSize, 8, 1.0);
 
                     if (z > 0.0)
                         map[x, y] += noise * z * duration;
@@ -67,4 +67,4 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
 
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/OlsenSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/OlsenSphere.cs
index 23dea8a..153fc15 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/OlsenSphere.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/OlsenSphere.cs
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Region.Environment.Interfaces;
 using System;
+using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
 {
@@ -38,16 +38,10 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
     /// </summary>
     public class OlsenSphere : ITerrainPaintableEffect
     {
-        NeighbourSystem type = NeighbourSystem.Moore; // Parameter
-
-        double nConst = 1024.0;
+        private double nConst = 1024.0;
+        private NeighbourSystem type = NeighbourSystem.Moore; // Parameter
 
         #region Supporting Functions
-        private enum NeighbourSystem
-        {
-            Moore,
-            VonNeumann
-        } ;
 
         private int[] Neighbours(NeighbourSystem type, int index)
         {
@@ -153,6 +147,12 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
             return z;
         }
 
+        private enum NeighbourSystem
+        {
+            Moore,
+            VonNeumann
+        } ;
+
         #endregion
 
         #region ITerrainPaintableEffect Members
@@ -222,4 +222,4 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
 
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/RaiseSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/RaiseSphere.cs
index f90c407..8d61a7e 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/RaiseSphere.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/RaiseSphere.cs
@@ -64,4 +64,4 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
 
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/RevertSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/RevertSphere.cs
index 382c756..ee0edb5 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/RevertSphere.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/RevertSphere.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
 {
     public class RevertSphere : ITerrainPaintableEffect
     {
-        ITerrainChannel m_revertmap;
+        private ITerrainChannel m_revertmap;
 
         public RevertSphere(ITerrainChannel revertmap)
         {
@@ -79,4 +79,4 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
 
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/SmoothSphere.cs
index db5fb72..86a01cc 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/SmoothSphere.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/SmoothSphere.cs
@@ -38,24 +38,24 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
             strength = TerrainUtil.MetersToSphericalStrength(strength);
 
             int x, y;
-            double[,] tweak = new double[map.Width, map.Height];
-            
+            double[,] tweak = new double[map.Width,map.Height];
+
             double n, l;
             double area = strength;
             double step = strength / 4.0;
-            
+
             // compute delta map 
             for (x = 0; x < map.Width; x++)
             {
                 for (y = 0; y < map.Height; y++)
                 {
                     double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
-                    
+
                     if (z > 0) // add in non-zero amount 
                     {
                         double average = 0.0;
                         int avgsteps = 0;
-                        
+
                         for (n = 0.0 - area; n < area; n += step)
                         {
                             for (l = 0.0 - area; l < area; l += step)
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
                 for (y = 0; y < map.Height; y++)
                 {
                     double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
-                    
+
                     if (z > 0) // add in non-zero amount 
                     {
                         double da = z;
@@ -90,4 +90,4 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
 
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/WeatherSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/WeatherSphere.cs
index 79c9c63..f46ba8f 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/WeatherSphere.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/WeatherSphere.cs
@@ -34,15 +34,10 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
     /// </summary>
     public class WeatherSphere : ITerrainPaintableEffect
     {
-        NeighbourSystem type = NeighbourSystem.Moore; // Parameter
-        double talus = 0.2; // Number of meters max difference before stop eroding. Tweakage required.
+        private double talus = 0.2; // Number of meters max difference before stop eroding. Tweakage required.
+        private NeighbourSystem type = NeighbourSystem.Moore; // Parameter
 
         #region Supporting Functions
-        private enum NeighbourSystem
-        {
-            Moore,
-            VonNeumann
-        } ;
 
         private int[] Neighbours(NeighbourSystem type, int index)
         {
@@ -142,6 +137,12 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
             return coord;
         }
 
+        private enum NeighbourSystem
+        {
+            Moore,
+            VonNeumann
+        } ;
+
         #endregion
 
         #region ITerrainPaintableEffect Members
@@ -203,4 +204,4 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
 
         #endregion
     }
-}
+}
\ No newline at end of file