* Cleaned up code in Terrain, Tree and Map modules.

* Fixed a bug with Terragen loader where it would do bad things on a non 256x256 sized terrain. Now loads the array correctly. 
* Moved MapImageModule.cs to Modules/World/WorldMap
* Changed Location.RegionHandle to use Helpers.GetUlong instead of doing it ourselves.

5 files changed, 8 insertions, 6 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs
index 496da63..f3c8a13 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs
@@ -37,7 +37,6 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
         {
             double sum = 0.0;
             double steps = 0.0;
-            double avg;
 
             int x, y;
             for (x = 0; x < map.Width; x++)
@@ -52,7 +51,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
                 }
             }
 
-            avg = sum / steps;
+            double avg = sum / steps;
 
             double str = 0.1 * strength; // == 0.2 in the default client
 
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs
index 6c8e76e..f7c4893 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs
@@ -36,9 +36,10 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
 
         public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
         {
-            int x, y;
+            int x;
             for (x = 0; x < map.Width; x++)
             {
+                int y;
                 for (y = 0; y < map.Height; y++)
                 {
                     if (fillArea[x, y])
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs
index 5cb236c..5eff3d6 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs
@@ -35,9 +35,10 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
 
         public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
         {
-            int x, y;
+            int x;
             for (x = 0; x < map.Width; x++)
             {
+                int y;
                 for (y = 0; y < map.Height; y++)
                 {
                     if (fillArea[x, y])
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs
index f1d9ce6..bebcae5 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs
@@ -42,9 +42,10 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
 
         public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
         {
-            int x, y;
+            int x;
             for (x = 0; x < map.Width; x++)
             {
+                int y;
                 for (y = 0; y < map.Height; y++)
                 {
                     if (fillArea[x, y])
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs
index d17d9cb..8fd805e 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
             if (y < 0.0)
                 y = 0.0;
 
-            int stepSize = 1;
+            const int stepSize = 1;
             double h00 = map[(int) x, (int) y];
             double h10 = map[(int) x + stepSize, (int) y];
             double h01 = map[(int) x, (int) y + stepSize];