* 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.

1 files changed, 2 insertions, 5 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
index 4f7d20c..305818f 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Environment.Modules.World.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 / 2, Constants.RegionSize / 2, 50) * 0.01;
+                    double spherFac = TerrainUtil.SphericalFactor(x, y, Constants.RegionSize / 2.0, Constants.RegionSize / 2.0, 50) * 0.01;
                     if (map[x, y] < spherFac)
                     {
                         map[x, y] = spherFac;
@@ -138,10 +138,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
                 taint[x / 16, y / 16] = false;
                 return true;
             }
-            else
-            {
-                return false;
-            }
+            return false;
         }
 
         #endregion