Update svn properties. Minor formatting cleanup.

37 files changed, 4119 insertions, 4119 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs b/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs
index 731326e..a2e0c40 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs
@@ -1,124 +1,124 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-using System;

-using OpenSim.Region.Environment.Interfaces;

-using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes;

-using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects

-{

-    internal class CookieCutter : ITerrainEffect

-    {

-        #region ITerrainEffect Members

-

-        public void RunEffect(ITerrainChannel map)

-        {

-            SmoothArea smooth = new SmoothArea();

-            ITerrainPaintableEffect eroder = new WeatherSphere();

-

-            bool[,] cliffMask = new bool[map.Width,map.Height];

-            bool[,] channelMask = new bool[map.Width,map.Height];

-            bool[,] smoothMask = new bool[map.Width,map.Height];

-

-            Console.WriteLine("S1");

-

-            // Step one, generate rough mask

-            int x, y;

-            for (x = 0; x < map.Width; x++)

-            {

-                for (y = 0; y < map.Height; y++)

-                {

-                    Console.Write(".");

-                    smoothMask[x, y] = true;

-

-                    // Start underwater

-                    map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 5;

-                    // Add a little height. (terrain should now be above water, mostly.)

-                    map[x, y] += 20;

-

-                    int channelsX = 4;

-                    int channelWidth = (map.Width / channelsX / 4);

-                    int channelsY = 4;

-                    int channelHeight = (map.Height / channelsY / 4);

-

-                    SetLowerChannel(map, cliffMask, channelMask, x, y, channelsX, channelWidth, map.Width, x);

-                    SetLowerChannel(map, cliffMask, channelMask, x, y, channelsY, channelHeight, map.Height, y);

-                }

-            }

-

-            Console.WriteLine("S2");

-            //smooth.FloodEffect(map, smoothMask, 4.0);

-

-            Console.WriteLine("S3");

-            for (x = 0; x < map.Width; x++)

-            {

-                for (y = 0; y < map.Height; y++)

-                {

-                    if (cliffMask[x, y] == true)

-                        eroder.PaintEffect(map, x, y, 4, 0.1);

-                }

-            }

-

-            for (x = 0; x < map.Width; x += 2)

-            {

-                for (y = 0; y < map.Height; y += 2)

-                {

-                    if (map[x, y] < 0.1)

-                        map[x, y] = 0.1;

-                    if (map[x, y] > 256)

-                        map[x, y] = 256;

-                }

-            }

-            //smooth.FloodEffect(map, smoothMask, 4.0);

-        }

-

-        #endregion

-

-        private static void SetLowerChannel(ITerrainChannel map, bool[,] cliffMask, bool[,] channelMask, int x, int y, int numChannels, int channelWidth,

-                                            int mapSize, int rp)

-        {

-            for (int i = 0; i < numChannels; i++)

-            {

-                double distanceToLine = Math.Abs(rp - ((mapSize / numChannels) * i));

-

-                if (distanceToLine < channelWidth)

-                {

-                    if (channelMask[x, y])

-                        return;

-

-                    // Remove channels

-                    map[x, y] -= 10;

-                    channelMask[x, y] = true;

-                }

-                if (distanceToLine < 1)

-                {

-                    cliffMask[x, y] = true;

-                }

-            }

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
+using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes;
+using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects
+{
+    internal class CookieCutter : ITerrainEffect
+    {
+        #region ITerrainEffect Members
+
+        public void RunEffect(ITerrainChannel map)
+        {
+            SmoothArea smooth = new SmoothArea();
+            ITerrainPaintableEffect eroder = new WeatherSphere();
+
+            bool[,] cliffMask = new bool[map.Width,map.Height];
+            bool[,] channelMask = new bool[map.Width,map.Height];
+            bool[,] smoothMask = new bool[map.Width,map.Height];
+
+            Console.WriteLine("S1");
+
+            // Step one, generate rough mask
+            int x, y;
+            for (x = 0; x < map.Width; x++)
+            {
+                for (y = 0; y < map.Height; y++)
+                {
+                    Console.Write(".");
+                    smoothMask[x, y] = true;
+
+                    // Start underwater
+                    map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 5;
+                    // Add a little height. (terrain should now be above water, mostly.)
+                    map[x, y] += 20;
+
+                    int channelsX = 4;
+                    int channelWidth = (map.Width / channelsX / 4);
+                    int channelsY = 4;
+                    int channelHeight = (map.Height / channelsY / 4);
+
+                    SetLowerChannel(map, cliffMask, channelMask, x, y, channelsX, channelWidth, map.Width, x);
+                    SetLowerChannel(map, cliffMask, channelMask, x, y, channelsY, channelHeight, map.Height, y);
+                }
+            }
+
+            Console.WriteLine("S2");
+            //smooth.FloodEffect(map, smoothMask, 4.0);
+
+            Console.WriteLine("S3");
+            for (x = 0; x < map.Width; x++)
+            {
+                for (y = 0; y < map.Height; y++)
+                {
+                    if (cliffMask[x, y] == true)
+                        eroder.PaintEffect(map, x, y, 4, 0.1);
+                }
+            }
+
+            for (x = 0; x < map.Width; x += 2)
+            {
+                for (y = 0; y < map.Height; y += 2)
+                {
+                    if (map[x, y] < 0.1)
+                        map[x, y] = 0.1;
+                    if (map[x, y] > 256)
+                        map[x, y] = 256;
+                }
+            }
+            //smooth.FloodEffect(map, smoothMask, 4.0);
+        }
+
+        #endregion
+
+        private static void SetLowerChannel(ITerrainChannel map, bool[,] cliffMask, bool[,] channelMask, int x, int y, int numChannels, int channelWidth,
+                                            int mapSize, int rp)
+        {
+            for (int i = 0; i < numChannels; i++)
+            {
+                double distanceToLine = Math.Abs(rp - ((mapSize / numChannels) * i));
+
+                if (distanceToLine < channelWidth)
+                {
+                    if (channelMask[x, y])
+                        return;
+
+                    // Remove channels
+                    map[x, y] -= 10;
+                    channelMask[x, y] = true;
+                }
+                if (distanceToLine < 1)
+                {
+                    cliffMask[x, y] = true;
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/DefaultTerrainGenerator.cs b/OpenSim/Region/Environment/Modules/World/Terrain/Effects/DefaultTerrainGenerator.cs
index 9c35d4e..5bc6799 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/DefaultTerrainGenerator.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/Effects/DefaultTerrainGenerator.cs
@@ -1,55 +1,55 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-using OpenSim.Framework;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects

-{

-    internal class DefaultTerrainGenerator : ITerrainEffect

-    {

-        #region ITerrainEffect Members

-

-        public void RunEffect(ITerrainChannel map)

-        {

-            int x, y;

-            for (x = 0; x < map.Width; x++)

-            {

-                for (y = 0; y < map.Height; 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;

-                    }

-                }

-            }

-        }

-

-        #endregion

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using OpenSim.Framework;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects
+{
+    internal class DefaultTerrainGenerator : ITerrainEffect
+    {
+        #region ITerrainEffect Members
+
+        public void RunEffect(ITerrainChannel map)
+        {
+            int x, y;
+            for (x = 0; x < map.Width; x++)
+            {
+                for (y = 0; y < map.Height; 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;
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs
index 4705dad..eb981d9 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs
@@ -1,62 +1,62 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-using System.Drawing;

-using System.Drawing.Imaging;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders

-{

-    /// <summary>

-    /// A generic windows bitmap loader. 

-    /// Should be capable of handling 24-bit RGB images.

-    /// 

-    /// Uses the System.Drawing filesystem loader.

-    /// </summary>

-    internal class BMP : GenericSystemDrawing

-    {

-        /// <summary>

-        /// Exports a file to a image on the disk using a System.Drawing exporter.

-        /// </summary>

-        /// <param name="filename">The target filename</param>

-        /// <param name="map">The terrain channel being saved</param>

-        public override void SaveFile(string filename, ITerrainChannel map)

-        {

-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);

-

-            colours.Save(filename, ImageFormat.Bmp);

-        }

-

-        /// <summary>

-        /// The human readable version of the file format(s) this loader handles

-        /// </summary>

-        /// <returns></returns>

-        public override string ToString()

-        {

-            return "BMP";

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System.Drawing;
+using System.Drawing.Imaging;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+{
+    /// <summary>
+    /// A generic windows bitmap loader. 
+    /// Should be capable of handling 24-bit RGB images.
+    /// 
+    /// Uses the System.Drawing filesystem loader.
+    /// </summary>
+    internal class BMP : GenericSystemDrawing
+    {
+        /// <summary>
+        /// Exports a file to a image on the disk using a System.Drawing exporter.
+        /// </summary>
+        /// <param name="filename">The target filename</param>
+        /// <param name="map">The terrain channel being saved</param>
+        public override void SaveFile(string filename, ITerrainChannel map)
+        {
+            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+
+            colours.Save(filename, ImageFormat.Bmp);
+        }
+
+        /// <summary>
+        /// The human readable version of the file format(s) this loader handles
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            return "BMP";
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs
index 9c2fedc..9bfe851 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs
@@ -1,47 +1,47 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-using System.Drawing;

-using System.Drawing.Imaging;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders

-{

-    internal class GIF : GenericSystemDrawing

-    {

-        public override void SaveFile(string filename, ITerrainChannel map)

-        {

-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);

-

-            colours.Save(filename, ImageFormat.Gif);

-        }

-

-        public override string ToString()

-        {

-            return "GIF";

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System.Drawing;
+using System.Drawing.Imaging;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+{
+    internal class GIF : GenericSystemDrawing
+    {
+        public override void SaveFile(string filename, ITerrainChannel map)
+        {
+            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+
+            colours.Save(filename, ImageFormat.Gif);
+        }
+
+        public override string ToString()
+        {
+            return "GIF";
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
index b5e6bd9..9730b16 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
@@ -1,172 +1,172 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using System;

-using System.Drawing;

-using System.Drawing.Imaging;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders

-{

-    /// <summary>

-    /// A virtual class designed to have methods overloaded, 

-    /// this class provides an interface for a generic image

-    /// saving and loading mechanism, but does not specify the

-    /// format. It should not be insubstantiated directly.

-    /// </summary>

-    public class GenericSystemDrawing : ITerrainLoader

-    {

-        #region ITerrainLoader Members

-

-        public string FileExtension

-        {

-            get { return ".gsd"; }

-        }

-

-        /// <summary>

-        /// Loads a file from a specified filename on the disk,

-        /// parses the image using the System.Drawing parsers

-        /// then returns a terrain channel. Values are

-        /// returned based on HSL brightness between 0m and 128m

-        /// </summary>

-        /// <param name="filename">The target image to load</param>

-        /// <returns>A terrain channel generated from the image.</returns>

-        public virtual ITerrainChannel LoadFile(string filename)

-        {

-            Bitmap file = new Bitmap(filename);

-

-            ITerrainChannel retval = new TerrainChannel(file.Width, file.Height);

-

-            int x, y;

-            for (x = 0; x < file.Width; x++)

-            {

-                for (y = 0; y < file.Height; y++)

-                {

-                    retval[x, y] = file.GetPixel(x, y).GetBrightness() * 128;

-                }

-            }

-

-            return retval;

-        }

-

-        public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h)

-        {

-            throw new NotImplementedException();

-        }

-

-        /// <summary>

-        /// Exports a file to a image on the disk using a System.Drawing exporter.

-        /// </summary>

-        /// <param name="filename">The target filename</param>

-        /// <param name="map">The terrain channel being saved</param>

-        public virtual void SaveFile(string filename, ITerrainChannel map)

-        {

-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);

-

-            colours.Save(filename, ImageFormat.Png);

-        }

-

-        #endregion

-

-        public override string ToString()

-        {

-            return "SYS.DRAWING";

-        }

-

-        /// <summary>

-        /// Protected method, generates a grayscale bitmap 

-        /// image from a specified terrain channel.

-        /// </summary>

-        /// <param name="map">The terrain channel to export to bitmap</param>

-        /// <returns>A System.Drawing.Bitmap containing a grayscale image</returns>

-        protected Bitmap CreateGrayscaleBitmapFromMap(ITerrainChannel map)

-        {

-            Bitmap bmp = new Bitmap(map.Width, map.Height);

-

-            int pallete = 256;

-

-            Color[] grays = new Color[pallete];

-            for (int i = 0; i < grays.Length; i++)

-            {

-                grays[i] = Color.FromArgb(i, i, i);

-            }

-

-            for (int y = 0; y < map.Height; y++)

-            {

-                for (int x = 0; x < map.Width; x++)

-                {

-                    // 512 is the largest possible height before colours clamp

-                    int colorindex = (int) (Math.Max(Math.Min(1.0, map[x, y] / 128.0), 0.0) * (pallete - 1));

-

-                    // Handle error conditions

-                    if (colorindex > pallete - 1 || colorindex < 0)

-                        bmp.SetPixel(x, map.Height - y - 1, Color.Red);

-                    else

-                        bmp.SetPixel(x, map.Height - y - 1, grays[colorindex]);

-                }

-            }

-            return bmp;

-        }

-

-        /// <summary>

-        /// Protected method, generates a coloured bitmap 

-        /// image from a specified terrain channel.

-        /// </summary>

-        /// <param name="map">The terrain channel to export to bitmap</param>

-        /// <returns>A System.Drawing.Bitmap containing a coloured image</returns>

-        protected Bitmap CreateBitmapFromMap(ITerrainChannel map)

-        {

-            Bitmap gradientmapLd = new Bitmap("defaultstripe.png");

-

-            int pallete = gradientmapLd.Height;

-

-            Bitmap bmp = new Bitmap(map.Width, map.Height);

-            Color[] colours = new Color[pallete];

-

-            for (int i = 0; i < pallete; i++)

-            {

-                colours[i] = gradientmapLd.GetPixel(0, i);

-            }

-

-            for (int y = 0; y < map.Height; y++)

-            {

-                for (int x = 0; x < map.Width; x++)

-                {

-                    // 512 is the largest possible height before colours clamp

-                    int colorindex = (int) (Math.Max(Math.Min(1.0, map[x, y] / 512.0), 0.0) * (pallete - 1));

-

-                    // Handle error conditions

-                    if (colorindex > pallete - 1 || colorindex < 0)

-                        bmp.SetPixel(x, map.Height - y - 1, Color.Red);

-                    else

-                        bmp.SetPixel(x, map.Height - y - 1, colours[colorindex]);

-                }

-            }

-            return bmp;

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+{
+    /// <summary>
+    /// A virtual class designed to have methods overloaded, 
+    /// this class provides an interface for a generic image
+    /// saving and loading mechanism, but does not specify the
+    /// format. It should not be insubstantiated directly.
+    /// </summary>
+    public class GenericSystemDrawing : ITerrainLoader
+    {
+        #region ITerrainLoader Members
+
+        public string FileExtension
+        {
+            get { return ".gsd"; }
+        }
+
+        /// <summary>
+        /// Loads a file from a specified filename on the disk,
+        /// parses the image using the System.Drawing parsers
+        /// then returns a terrain channel. Values are
+        /// returned based on HSL brightness between 0m and 128m
+        /// </summary>
+        /// <param name="filename">The target image to load</param>
+        /// <returns>A terrain channel generated from the image.</returns>
+        public virtual ITerrainChannel LoadFile(string filename)
+        {
+            Bitmap file = new Bitmap(filename);
+
+            ITerrainChannel retval = new TerrainChannel(file.Width, file.Height);
+
+            int x, y;
+            for (x = 0; x < file.Width; x++)
+            {
+                for (y = 0; y < file.Height; y++)
+                {
+                    retval[x, y] = file.GetPixel(x, y).GetBrightness() * 128;
+                }
+            }
+
+            return retval;
+        }
+
+        public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Exports a file to a image on the disk using a System.Drawing exporter.
+        /// </summary>
+        /// <param name="filename">The target filename</param>
+        /// <param name="map">The terrain channel being saved</param>
+        public virtual void SaveFile(string filename, ITerrainChannel map)
+        {
+            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+
+            colours.Save(filename, ImageFormat.Png);
+        }
+
+        #endregion
+
+        public override string ToString()
+        {
+            return "SYS.DRAWING";
+        }
+
+        /// <summary>
+        /// Protected method, generates a grayscale bitmap 
+        /// image from a specified terrain channel.
+        /// </summary>
+        /// <param name="map">The terrain channel to export to bitmap</param>
+        /// <returns>A System.Drawing.Bitmap containing a grayscale image</returns>
+        protected Bitmap CreateGrayscaleBitmapFromMap(ITerrainChannel map)
+        {
+            Bitmap bmp = new Bitmap(map.Width, map.Height);
+
+            int pallete = 256;
+
+            Color[] grays = new Color[pallete];
+            for (int i = 0; i < grays.Length; i++)
+            {
+                grays[i] = Color.FromArgb(i, i, i);
+            }
+
+            for (int y = 0; y < map.Height; y++)
+            {
+                for (int x = 0; x < map.Width; x++)
+                {
+                    // 512 is the largest possible height before colours clamp
+                    int colorindex = (int) (Math.Max(Math.Min(1.0, map[x, y] / 128.0), 0.0) * (pallete - 1));
+
+                    // Handle error conditions
+                    if (colorindex > pallete - 1 || colorindex < 0)
+                        bmp.SetPixel(x, map.Height - y - 1, Color.Red);
+                    else
+                        bmp.SetPixel(x, map.Height - y - 1, grays[colorindex]);
+                }
+            }
+            return bmp;
+        }
+
+        /// <summary>
+        /// Protected method, generates a coloured bitmap 
+        /// image from a specified terrain channel.
+        /// </summary>
+        /// <param name="map">The terrain channel to export to bitmap</param>
+        /// <returns>A System.Drawing.Bitmap containing a coloured image</returns>
+        protected Bitmap CreateBitmapFromMap(ITerrainChannel map)
+        {
+            Bitmap gradientmapLd = new Bitmap("defaultstripe.png");
+
+            int pallete = gradientmapLd.Height;
+
+            Bitmap bmp = new Bitmap(map.Width, map.Height);
+            Color[] colours = new Color[pallete];
+
+            for (int i = 0; i < pallete; i++)
+            {
+                colours[i] = gradientmapLd.GetPixel(0, i);
+            }
+
+            for (int y = 0; y < map.Height; y++)
+            {
+                for (int x = 0; x < map.Width; x++)
+                {
+                    // 512 is the largest possible height before colours clamp
+                    int colorindex = (int) (Math.Max(Math.Min(1.0, map[x, y] / 512.0), 0.0) * (pallete - 1));
+
+                    // Handle error conditions
+                    if (colorindex > pallete - 1 || colorindex < 0)
+                        bmp.SetPixel(x, map.Height - y - 1, Color.Red);
+                    else
+                        bmp.SetPixel(x, map.Height - y - 1, colours[colorindex]);
+                }
+            }
+            return bmp;
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs
index 39ade10..d58926e 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs
@@ -1,94 +1,94 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using System;

-using System.Drawing;

-using System.Drawing.Imaging;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders

-{

-    public class JPEG : ITerrainLoader

-    {

-        #region ITerrainLoader Members

-

-        public string FileExtension

-        {

-            get { return ".jpg"; }

-        }

-

-        public ITerrainChannel LoadFile(string filename)

-        {

-            throw new NotImplementedException();

-        }

-

-        public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h)

-        {

-            throw new NotImplementedException();

-        }

-

-        public void SaveFile(string filename, ITerrainChannel map)

-        {

-            Bitmap colours = CreateBitmapFromMap(map);

-

-            colours.Save(filename, ImageFormat.Jpeg);

-        }

-

-        #endregion

-

-        public override string ToString()

-        {

-            return "JPEG";

-        }

-

-        private Bitmap CreateBitmapFromMap(ITerrainChannel map)

-        {

-            Bitmap gradientmapLd = new Bitmap("defaultstripe.png");

-

-            int pallete = gradientmapLd.Height;

-

-            Bitmap bmp = new Bitmap(map.Width, map.Height);

-            Color[] colours = new Color[pallete];

-

-            for (int i = 0; i < pallete; i++)

-            {

-                colours[i] = gradientmapLd.GetPixel(0, i);

-            }

-

-            for (int y = 0; y < map.Height; y++)

-            {

-                for (int x = 0; x < map.Width; x++)

-                {

-                    // 512 is the largest possible height before colours clamp

-                    int colorindex = (int) (Math.Max(Math.Min(1.0, map[x, y] / 512.0), 0.0) * (pallete - 1));

-                    bmp.SetPixel(x, map.Height - y - 1, colours[colorindex]);

-                }

-            }

-            return bmp;

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+{
+    public class JPEG : ITerrainLoader
+    {
+        #region ITerrainLoader Members
+
+        public string FileExtension
+        {
+            get { return ".jpg"; }
+        }
+
+        public ITerrainChannel LoadFile(string filename)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void SaveFile(string filename, ITerrainChannel map)
+        {
+            Bitmap colours = CreateBitmapFromMap(map);
+
+            colours.Save(filename, ImageFormat.Jpeg);
+        }
+
+        #endregion
+
+        public override string ToString()
+        {
+            return "JPEG";
+        }
+
+        private Bitmap CreateBitmapFromMap(ITerrainChannel map)
+        {
+            Bitmap gradientmapLd = new Bitmap("defaultstripe.png");
+
+            int pallete = gradientmapLd.Height;
+
+            Bitmap bmp = new Bitmap(map.Width, map.Height);
+            Color[] colours = new Color[pallete];
+
+            for (int i = 0; i < pallete; i++)
+            {
+                colours[i] = gradientmapLd.GetPixel(0, i);
+            }
+
+            for (int y = 0; y < map.Height; y++)
+            {
+                for (int x = 0; x < map.Width; x++)
+                {
+                    // 512 is the largest possible height before colours clamp
+                    int colorindex = (int) (Math.Max(Math.Min(1.0, map[x, y] / 512.0), 0.0) * (pallete - 1));
+                    bmp.SetPixel(x, map.Height - y - 1, colours[colorindex]);
+                }
+            }
+            return bmp;
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs
index 468ecc9..5d6723f 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs
@@ -1,148 +1,148 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using System;

-using System.IO;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders

-{

-    public class LLRAW : ITerrainLoader

-    {

-        #region ITerrainLoader Members

-

-        public ITerrainChannel LoadFile(string filename)

-        {

-            TerrainChannel retval = new TerrainChannel();

-

-            FileInfo file = new FileInfo(filename);

-            FileStream s = file.Open(FileMode.Open, FileAccess.Read);

-            BinaryReader bs = new BinaryReader(s);

-            int x, y;

-            for (y = 0; y < retval.Height; y++)

-            {

-                for (x = 0; x < retval.Width; x++)

-                {

-                    retval[x, y] = (double) bs.ReadByte() * ((double) bs.ReadByte() / 127.0);

-                    bs.ReadBytes(11); // Advance the stream to next bytes.

-                }

-            }

-

-            bs.Close();

-            s.Close();

-

-            return retval;

-        }

-

-        public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h)

-        {

-            throw new NotImplementedException();

-        }

-

-        public void SaveFile(string filename, ITerrainChannel map)

-        {

-            FileInfo file = new FileInfo(filename);

-            FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write);

-            BinaryWriter binStream = new BinaryWriter(s);

-

-            // Generate a smegging big lookup table to speed the operation up (it needs it)

-            double[] lookupHeightTable = new double[65536];

-            int i, j, x, y;

-            for (i = 0; i < 256; i++)

-            {

-                for (j = 0; j < 256; j++)

-                {

-                    lookupHeightTable[i + (j * 256)] = ((double) i * ((double) j / 127.0));

-                }

-            }

-

-            // Output the calculated raw

-            for (y = 0; y < map.Height; y++)

-            {

-                for (x = 0; x < map.Width; x++)

-                {

-                    double t = map[x, y];

-                    double min = double.MaxValue;

-                    int index = 0;

-

-                    for (i = 0; i < 65536; i++)

-                    {

-                        if (Math.Abs(t - lookupHeightTable[i]) < min)

-                        {

-                            min = Math.Abs(t - lookupHeightTable[i]);

-                            index = i;

-                        }

-                    }

-

-                    byte red = (byte) (index & 0xFF);

-                    byte green = (byte) ((index >> 8) & 0xFF);

-                    byte blue = 20;

-                    byte alpha1 = 0; // Land Parcels

-                    byte alpha2 = 0; // For Sale Land

-                    byte alpha3 = 0; // Public Edit Object

-                    byte alpha4 = 0; // Public Edit Land

-                    byte alpha5 = 255; // Safe Land

-                    byte alpha6 = 255; // Flying Allowed

-                    byte alpha7 = 255; // Create Landmark

-                    byte alpha8 = 255; // Outside Scripts

-                    byte alpha9 = red;

-                    byte alpha10 = green;

-

-                    binStream.Write(red);

-                    binStream.Write(green);

-                    binStream.Write(blue);

-                    binStream.Write(alpha1);

-                    binStream.Write(alpha2);

-                    binStream.Write(alpha3);

-                    binStream.Write(alpha4);

-                    binStream.Write(alpha5);

-                    binStream.Write(alpha6);

-                    binStream.Write(alpha7);

-                    binStream.Write(alpha8);

-                    binStream.Write(alpha9);

-                    binStream.Write(alpha10);

-                }

-            }

-

-            binStream.Close();

-            s.Close();

-        }

-

-

-        public string FileExtension

-        {

-            get { return ".raw"; }

-        }

-

-        #endregion

-

-        public override string ToString()

-        {

-            return "LL/SL RAW";

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.IO;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+{
+    public class LLRAW : ITerrainLoader
+    {
+        #region ITerrainLoader Members
+
+        public ITerrainChannel LoadFile(string filename)
+        {
+            TerrainChannel retval = new TerrainChannel();
+
+            FileInfo file = new FileInfo(filename);
+            FileStream s = file.Open(FileMode.Open, FileAccess.Read);
+            BinaryReader bs = new BinaryReader(s);
+            int x, y;
+            for (y = 0; y < retval.Height; y++)
+            {
+                for (x = 0; x < retval.Width; x++)
+                {
+                    retval[x, y] = (double) bs.ReadByte() * ((double) bs.ReadByte() / 127.0);
+                    bs.ReadBytes(11); // Advance the stream to next bytes.
+                }
+            }
+
+            bs.Close();
+            s.Close();
+
+            return retval;
+        }
+
+        public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void SaveFile(string filename, ITerrainChannel map)
+        {
+            FileInfo file = new FileInfo(filename);
+            FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write);
+            BinaryWriter binStream = new BinaryWriter(s);
+
+            // Generate a smegging big lookup table to speed the operation up (it needs it)
+            double[] lookupHeightTable = new double[65536];
+            int i, j, x, y;
+            for (i = 0; i < 256; i++)
+            {
+                for (j = 0; j < 256; j++)
+                {
+                    lookupHeightTable[i + (j * 256)] = ((double) i * ((double) j / 127.0));
+                }
+            }
+
+            // Output the calculated raw
+            for (y = 0; y < map.Height; y++)
+            {
+                for (x = 0; x < map.Width; x++)
+                {
+                    double t = map[x, y];
+                    double min = double.MaxValue;
+                    int index = 0;
+
+                    for (i = 0; i < 65536; i++)
+                    {
+                        if (Math.Abs(t - lookupHeightTable[i]) < min)
+                        {
+                            min = Math.Abs(t - lookupHeightTable[i]);
+                            index = i;
+                        }
+                    }
+
+                    byte red = (byte) (index & 0xFF);
+                    byte green = (byte) ((index >> 8) & 0xFF);
+                    byte blue = 20;
+                    byte alpha1 = 0; // Land Parcels
+                    byte alpha2 = 0; // For Sale Land
+                    byte alpha3 = 0; // Public Edit Object
+                    byte alpha4 = 0; // Public Edit Land
+                    byte alpha5 = 255; // Safe Land
+                    byte alpha6 = 255; // Flying Allowed
+                    byte alpha7 = 255; // Create Landmark
+                    byte alpha8 = 255; // Outside Scripts
+                    byte alpha9 = red;
+                    byte alpha10 = green;
+
+                    binStream.Write(red);
+                    binStream.Write(green);
+                    binStream.Write(blue);
+                    binStream.Write(alpha1);
+                    binStream.Write(alpha2);
+                    binStream.Write(alpha3);
+                    binStream.Write(alpha4);
+                    binStream.Write(alpha5);
+                    binStream.Write(alpha6);
+                    binStream.Write(alpha7);
+                    binStream.Write(alpha8);
+                    binStream.Write(alpha9);
+                    binStream.Write(alpha10);
+                }
+            }
+
+            binStream.Close();
+            s.Close();
+        }
+
+
+        public string FileExtension
+        {
+            get { return ".raw"; }
+        }
+
+        #endregion
+
+        public override string ToString()
+        {
+            return "LL/SL RAW";
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs
index 2925c7d..b893f70 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs
@@ -1,47 +1,47 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-using System.Drawing;

-using System.Drawing.Imaging;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders

-{

-    internal class PNG : GenericSystemDrawing

-    {

-        public override void SaveFile(string filename, ITerrainChannel map)

-        {

-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);

-

-            colours.Save(filename, ImageFormat.Png);

-        }

-

-        public override string ToString()

-        {

-            return "PNG";

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System.Drawing;
+using System.Drawing.Imaging;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+{
+    internal class PNG : GenericSystemDrawing
+    {
+        public override void SaveFile(string filename, ITerrainChannel map)
+        {
+            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+
+            colours.Save(filename, ImageFormat.Png);
+        }
+
+        public override string ToString()
+        {
+            return "PNG";
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs
index 71f56c5..fd2136c 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs
@@ -1,153 +1,153 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using System.IO;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders

-{

-    public class RAW32 : ITerrainLoader

-    {

-        #region ITerrainLoader Members

-

-        public string FileExtension

-        {

-            get { return ".r32"; }

-        }

-

-        public ITerrainChannel LoadFile(string filename)

-        {

-            TerrainChannel retval = new TerrainChannel();

-

-            FileInfo file = new FileInfo(filename);

-            FileStream s = file.Open(FileMode.Open, FileAccess.Read);

-            BinaryReader bs = new BinaryReader(s);

-            int x, y;

-            for (y = 0; y < retval.Height; y++)

-            {

-                for (x = 0; x < retval.Width; x++)

-                {

-                    retval[x, y] = bs.ReadSingle();

-                }

-            }

-

-            bs.Close();

-            s.Close();

-

-            return retval;

-        }

-

-        public ITerrainChannel LoadFile(string filename, int offsetX, int offsetY, int fileWidth, int fileHeight, int sectionWidth, int sectionHeight)

-        {

-            TerrainChannel retval = new TerrainChannel(sectionWidth, sectionHeight);

-

-            FileInfo file = new FileInfo(filename);

-            FileStream s = file.Open(FileMode.Open, FileAccess.Read);

-            BinaryReader bs = new BinaryReader(s);

-

-            int currFileXOffset = 0;

-            int currFileYOffset = 0;

-

-            // if our region isn't on the first Y section of the areas to be landscaped, then

-            // advance to our section of the file

-            while (currFileYOffset < offsetY)

-            {

-                // read a whole strip of regions

-                int heightsToRead = sectionHeight * (fileWidth * sectionWidth);

-                bs.ReadBytes(heightsToRead * 4); // because the floats are 4 bytes in the file

-                currFileYOffset++;

-            }

-

-            // got to the Y start offset within the file of our region

-            // so read the file bits associated with our region

-            int x, y;

-            // for each Y within our Y offset

-            for (y = 0; y < sectionHeight; y++)

-            {

-                currFileXOffset = 0;

-

-                // if our region isn't the first X section of the areas to be landscaped, then

-                // advance the stream to the X start pos of our section in the file

-                // i.e. eat X upto where we start

-                while (currFileXOffset < offsetX)

-                {

-                    bs.ReadBytes(sectionWidth * 4); // 4 bytes = single

-                    currFileXOffset++;

-                }

-

-                // got to our X offset, so write our regions X line

-                for (x = 0; x < sectionWidth; x++)

-                {

-                    // Read a strip and continue

-                    retval[x, y] = bs.ReadSingle();

-                }

-                // record that we wrote it

-                currFileXOffset++;

-

-                // if our region isn't the last X section of the areas to be landscaped, then

-                // advance the stream to the end of this Y column

-                while (currFileXOffset < fileWidth)

-                {

-                    // eat the next regions x line

-                    bs.ReadBytes(sectionWidth * 4); // 4 bytes = single

-                    currFileXOffset++;

-                }

-            }

-

-            bs.Close();

-            s.Close();

-

-            return retval;

-        }

-

-        public void SaveFile(string filename, ITerrainChannel map)

-        {

-            FileInfo file = new FileInfo(filename);

-            FileStream s = file.Open(FileMode.Create, FileAccess.Write);

-            BinaryWriter bs = new BinaryWriter(s);

-

-            int x, y;

-            for (y = 0; y < map.Height; y++)

-            {

-                for (x = 0; x < map.Width; x++)

-                {

-                    bs.Write((float) map[x, y]);

-                }

-            }

-

-            bs.Close();

-            s.Close();

-        }

-

-        #endregion

-

-        public override string ToString()

-        {

-            return "RAW32";

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.IO;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+{
+    public class RAW32 : ITerrainLoader
+    {
+        #region ITerrainLoader Members
+
+        public string FileExtension
+        {
+            get { return ".r32"; }
+        }
+
+        public ITerrainChannel LoadFile(string filename)
+        {
+            TerrainChannel retval = new TerrainChannel();
+
+            FileInfo file = new FileInfo(filename);
+            FileStream s = file.Open(FileMode.Open, FileAccess.Read);
+            BinaryReader bs = new BinaryReader(s);
+            int x, y;
+            for (y = 0; y < retval.Height; y++)
+            {
+                for (x = 0; x < retval.Width; x++)
+                {
+                    retval[x, y] = bs.ReadSingle();
+                }
+            }
+
+            bs.Close();
+            s.Close();
+
+            return retval;
+        }
+
+        public ITerrainChannel LoadFile(string filename, int offsetX, int offsetY, int fileWidth, int fileHeight, int sectionWidth, int sectionHeight)
+        {
+            TerrainChannel retval = new TerrainChannel(sectionWidth, sectionHeight);
+
+            FileInfo file = new FileInfo(filename);
+            FileStream s = file.Open(FileMode.Open, FileAccess.Read);
+            BinaryReader bs = new BinaryReader(s);
+
+            int currFileXOffset = 0;
+            int currFileYOffset = 0;
+
+            // if our region isn't on the first Y section of the areas to be landscaped, then
+            // advance to our section of the file
+            while (currFileYOffset < offsetY)
+            {
+                // read a whole strip of regions
+                int heightsToRead = sectionHeight * (fileWidth * sectionWidth);
+                bs.ReadBytes(heightsToRead * 4); // because the floats are 4 bytes in the file
+                currFileYOffset++;
+            }
+
+            // got to the Y start offset within the file of our region
+            // so read the file bits associated with our region
+            int x, y;
+            // for each Y within our Y offset
+            for (y = 0; y < sectionHeight; y++)
+            {
+                currFileXOffset = 0;
+
+                // if our region isn't the first X section of the areas to be landscaped, then
+                // advance the stream to the X start pos of our section in the file
+                // i.e. eat X upto where we start
+                while (currFileXOffset < offsetX)
+                {
+                    bs.ReadBytes(sectionWidth * 4); // 4 bytes = single
+                    currFileXOffset++;
+                }
+
+                // got to our X offset, so write our regions X line
+                for (x = 0; x < sectionWidth; x++)
+                {
+                    // Read a strip and continue
+                    retval[x, y] = bs.ReadSingle();
+                }
+                // record that we wrote it
+                currFileXOffset++;
+
+                // if our region isn't the last X section of the areas to be landscaped, then
+                // advance the stream to the end of this Y column
+                while (currFileXOffset < fileWidth)
+                {
+                    // eat the next regions x line
+                    bs.ReadBytes(sectionWidth * 4); // 4 bytes = single
+                    currFileXOffset++;
+                }
+            }
+
+            bs.Close();
+            s.Close();
+
+            return retval;
+        }
+
+        public void SaveFile(string filename, ITerrainChannel map)
+        {
+            FileInfo file = new FileInfo(filename);
+            FileStream s = file.Open(FileMode.Create, FileAccess.Write);
+            BinaryWriter bs = new BinaryWriter(s);
+
+            int x, y;
+            for (y = 0; y < map.Height; y++)
+            {
+                for (x = 0; x < map.Width; x++)
+                {
+                    bs.Write((float) map[x, y]);
+                }
+            }
+
+            bs.Close();
+            s.Close();
+        }
+
+        #endregion
+
+        public override string ToString()
+        {
+            return "RAW32";
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs
index 3a137ae..c081aea 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs
@@ -1,47 +1,47 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-using System.Drawing;

-using System.Drawing.Imaging;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders

-{

-    internal class TIFF : GenericSystemDrawing

-    {

-        public override void SaveFile(string filename, ITerrainChannel map)

-        {

-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);

-

-            colours.Save(filename, ImageFormat.Tiff);

-        }

-

-        public override string ToString()

-        {

-            return "TIFF";

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System.Drawing;
+using System.Drawing.Imaging;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+{
+    internal class TIFF : GenericSystemDrawing
+    {
+        public override void SaveFile(string filename, ITerrainChannel map)
+        {
+            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+
+            colours.Save(filename, ImageFormat.Tiff);
+        }
+
+        public override string ToString()
+        {
+            return "TIFF";
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs
index f2672ad..7cb4b00 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs
@@ -1,127 +1,127 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using System;

-using System.IO;

-using System.Text;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders

-{

-    /// <summary>

-    /// Terragen File Format Loader

-    /// Built from specification at

-    /// http://www.planetside.co.uk/terragen/dev/tgterrain.html

-    /// </summary>

-    internal class Terragen : ITerrainLoader

-    {

-        #region ITerrainLoader Members

-

-        public ITerrainChannel LoadFile(string filename)

-        {

-            TerrainChannel retval = new TerrainChannel();

-

-            FileInfo file = new FileInfo(filename);

-            FileStream s = file.Open(FileMode.Open, FileAccess.Read);

-            BinaryReader bs = new BinaryReader(s);

-

-            bool eof = false;

-            if (ASCIIEncoding.ASCII.GetString(bs.ReadBytes(16)) == "TERRAGENTERRAIN ")

-            {

-                // Terragen file

-                while (eof == false)

-                {

-                    int w = 256;

-                    int h = 256;

-                    string tmp = ASCIIEncoding.ASCII.GetString(bs.ReadBytes(4));

-                    switch (tmp)

-                    {

-                        case "SIZE":

-                            int sztmp = bs.ReadInt16() + 1;

-                            w = sztmp;

-                            h = sztmp;

-                            bs.ReadInt16();

-                            break;

-                        case "XPTS":

-                            w = bs.ReadInt16();

-                            bs.ReadInt16();

-                            break;

-                        case "YPTS":

-                            h = bs.ReadInt16();

-                            bs.ReadInt16();

-                            break;

-                        case "ALTW":

-                            eof = true;

-                            Int16 heightScale = bs.ReadInt16();

-                            Int16 baseHeight = bs.ReadInt16();

-                            retval = new TerrainChannel(w, h);

-                            int x, y;

-                            for (x = 0; x < w; x++)

-                            {

-                                for (y = 0; y < h; y++)

-                                {

-                                    retval[x, y] = (double) baseHeight + (double) bs.ReadInt16() * (double) heightScale / 65536.0;

-                                }

-                            }

-                            break;

-                        default:

-                            bs.ReadInt32();

-                            break;

-                    }

-                }

-            }

-

-            bs.Close();

-            s.Close();

-

-            return retval;

-        }

-

-        public void SaveFile(string filename, ITerrainChannel map)

-        {

-            char[] header = "TERRAGENTERRAIN".ToCharArray();

-            throw new NotImplementedException();

-        }

-

-        public string FileExtension

-        {

-            get { return ".ter"; }

-        }

-

-        public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h)

-        {

-            throw new NotImplementedException();

-        }

-

-        #endregion

-

-        public override string ToString()

-        {

-            return "Terragen";

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.IO;
+using System.Text;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+{
+    /// <summary>
+    /// Terragen File Format Loader
+    /// Built from specification at
+    /// http://www.planetside.co.uk/terragen/dev/tgterrain.html
+    /// </summary>
+    internal class Terragen : ITerrainLoader
+    {
+        #region ITerrainLoader Members
+
+        public ITerrainChannel LoadFile(string filename)
+        {
+            TerrainChannel retval = new TerrainChannel();
+
+            FileInfo file = new FileInfo(filename);
+            FileStream s = file.Open(FileMode.Open, FileAccess.Read);
+            BinaryReader bs = new BinaryReader(s);
+
+            bool eof = false;
+            if (ASCIIEncoding.ASCII.GetString(bs.ReadBytes(16)) == "TERRAGENTERRAIN ")
+            {
+                // Terragen file
+                while (eof == false)
+                {
+                    int w = 256;
+                    int h = 256;
+                    string tmp = ASCIIEncoding.ASCII.GetString(bs.ReadBytes(4));
+                    switch (tmp)
+                    {
+                        case "SIZE":
+                            int sztmp = bs.ReadInt16() + 1;
+                            w = sztmp;
+                            h = sztmp;
+                            bs.ReadInt16();
+                            break;
+                        case "XPTS":
+                            w = bs.ReadInt16();
+                            bs.ReadInt16();
+                            break;
+                        case "YPTS":
+                            h = bs.ReadInt16();
+                            bs.ReadInt16();
+                            break;
+                        case "ALTW":
+                            eof = true;
+                            Int16 heightScale = bs.ReadInt16();
+                            Int16 baseHeight = bs.ReadInt16();
+                            retval = new TerrainChannel(w, h);
+                            int x, y;
+                            for (x = 0; x < w; x++)
+                            {
+                                for (y = 0; y < h; y++)
+                                {
+                                    retval[x, y] = (double) baseHeight + (double) bs.ReadInt16() * (double) heightScale / 65536.0;
+                                }
+                            }
+                            break;
+                        default:
+                            bs.ReadInt32();
+                            break;
+                    }
+                }
+            }
+
+            bs.Close();
+            s.Close();
+
+            return retval;
+        }
+
+        public void SaveFile(string filename, ITerrainChannel map)
+        {
+            char[] header = "TERRAGENTERRAIN".ToCharArray();
+            throw new NotImplementedException();
+        }
+
+        public string FileExtension
+        {
+            get { return ".ter"; }
+        }
+
+        public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        public override string ToString()
+        {
+            return "Terragen";
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs
index 7bf81d3..496da63 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs
@@ -1,71 +1,71 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes

-{

-    public class FlattenArea : ITerrainFloodEffect

-    {

-        #region ITerrainFloodEffect Members

-

-        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)

-        {

-            double sum = 0.0;

-            double steps = 0.0;

-            double avg;

-

-            int x, y;

-            for (x = 0; x < map.Width; x++)

-            {

-                for (y = 0; y < map.Height; y++)

-                {

-                    if (fillArea[x, y])

-                    {

-                        sum += map[x, y];

-                        steps += 1.0;

-                    }

-                }

-            }

-

-            avg = sum / steps;

-

-            double str = 0.1 * strength; // == 0.2 in the default client

-

-            for (x = 0; x < map.Width; x++)

-            {

-                for (y = 0; y < map.Height; y++)

-                {

-                    if (fillArea[x, y])

-                        map[x, y] = (map[x, y] * (1.0 - str)) + (avg * str);

-                }

-            }

-        }

-

-        #endregion

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
+{
+    public class FlattenArea : ITerrainFloodEffect
+    {
+        #region ITerrainFloodEffect Members
+
+        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
+        {
+            double sum = 0.0;
+            double steps = 0.0;
+            double avg;
+
+            int x, y;
+            for (x = 0; x < map.Width; x++)
+            {
+                for (y = 0; y < map.Height; y++)
+                {
+                    if (fillArea[x, y])
+                    {
+                        sum += map[x, y];
+                        steps += 1.0;
+                    }
+                }
+            }
+
+            avg = sum / steps;
+
+            double str = 0.1 * strength; // == 0.2 in the default client
+
+            for (x = 0; x < map.Width; x++)
+            {
+                for (y = 0; y < map.Height; y++)
+                {
+                    if (fillArea[x, y])
+                        map[x, y] = (map[x, y] * (1.0 - str)) + (avg * str);
+                }
+            }
+        }
+
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs
index a7a4431..3646d61 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs
@@ -1,54 +1,54 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes

-{

-    public class LowerArea : ITerrainFloodEffect

-    {

-        #region ITerrainFloodEffect Members

-

-        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)

-        {

-            int x;

-            for (x = 0; x < map.Width; x++)

-            {

-                int y;

-                for (y = 0; y < map.Height; y++)

-                {

-                    if (fillArea[x, y])

-                    {

-                        map[x, y] -= strength;

-                    }

-                }

-            }

-        }

-

-        #endregion

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
+{
+    public class LowerArea : ITerrainFloodEffect
+    {
+        #region ITerrainFloodEffect Members
+
+        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
+        {
+            int x;
+            for (x = 0; x < map.Width; x++)
+            {
+                int y;
+                for (y = 0; y < map.Height; y++)
+                {
+                    if (fillArea[x, y])
+                    {
+                        map[x, y] -= strength;
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs
index 3da3826..6c8e76e 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs
@@ -1,56 +1,56 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using OpenSim.Framework;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes

-{

-    public class NoiseArea : ITerrainFloodEffect

-    {

-        #region ITerrainFloodEffect Members

-

-        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)

-        {

-            int x, y;

-            for (x = 0; x < map.Width; x++)

-            {

-                for (y = 0; y < map.Height; y++)

-                {

-                    if (fillArea[x, y])

-                    {

-                        double noise = TerrainUtil.PerlinNoise2D((double) x / Constants.RegionSize, (double) y / Constants.RegionSize, 8, 1.0);

-

-                        map[x, y] += noise * strength;

-                    }

-                }

-            }

-        }

-

-        #endregion

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Framework;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
+{
+    public class NoiseArea : ITerrainFloodEffect
+    {
+        #region ITerrainFloodEffect Members
+
+        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
+        {
+            int x, y;
+            for (x = 0; x < map.Width; x++)
+            {
+                for (y = 0; y < map.Height; y++)
+                {
+                    if (fillArea[x, y])
+                    {
+                        double noise = TerrainUtil.PerlinNoise2D((double) x / Constants.RegionSize, (double) y / Constants.RegionSize, 8, 1.0);
+
+                        map[x, y] += noise * strength;
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs
index b57caed..5cb236c 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs
@@ -1,53 +1,53 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes

-{

-    public class RaiseArea : ITerrainFloodEffect

-    {

-        #region ITerrainFloodEffect Members

-

-        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)

-        {

-            int x, y;

-            for (x = 0; x < map.Width; x++)

-            {

-                for (y = 0; y < map.Height; y++)

-                {

-                    if (fillArea[x, y])

-                    {

-                        map[x, y] += strength;

-                    }

-                }

-            }

-        }

-

-        #endregion

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
+{
+    public class RaiseArea : ITerrainFloodEffect
+    {
+        #region ITerrainFloodEffect Members
+
+        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
+        {
+            int x, y;
+            for (x = 0; x < map.Width; x++)
+            {
+                for (y = 0; y < map.Height; y++)
+                {
+                    if (fillArea[x, y])
+                    {
+                        map[x, y] += strength;
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs
index 76a2cae..f1d9ce6 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs
@@ -1,60 +1,60 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes

-{

-    public class RevertArea : ITerrainFloodEffect

-    {

-        private readonly ITerrainChannel m_revertmap;

-

-        public RevertArea(ITerrainChannel revertmap)

-        {

-            m_revertmap = revertmap;

-        }

-

-        #region ITerrainFloodEffect Members

-

-        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)

-        {

-            int x, y;

-            for (x = 0; x < map.Width; x++)

-            {

-                for (y = 0; y < map.Height; y++)

-                {

-                    if (fillArea[x, y])

-                    {

-                        map[x, y] = (map[x, y] * (1.0 - strength)) + (m_revertmap[x, y] * strength);

-                    }

-                }

-            }

-        }

-

-        #endregion

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
+{
+    public class RevertArea : ITerrainFloodEffect
+    {
+        private readonly ITerrainChannel m_revertmap;
+
+        public RevertArea(ITerrainChannel revertmap)
+        {
+            m_revertmap = revertmap;
+        }
+
+        #region ITerrainFloodEffect Members
+
+        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
+        {
+            int x, y;
+            for (x = 0; x < map.Width; x++)
+            {
+                for (y = 0; y < map.Height; y++)
+                {
+                    if (fillArea[x, y])
+                    {
+                        map[x, y] = (map[x, y] * (1.0 - strength)) + (m_revertmap[x, y] * strength);
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs
index bdd9f18..d17d9cb 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs
@@ -1,114 +1,114 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes

-{

-    public class SmoothArea : ITerrainFloodEffect

-    {

-        #region ITerrainFloodEffect Members

-

-        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)

-        {

-            double area = strength;

-            double step = strength / 4.0;

-

-            double[,] manipulate = new double[map.Width,map.Height];

-            int x, y;

-            for (x = 0; x < map.Width; x++)

-            {

-                for (y = 0; y < map.Height; y++)

-                {

-                    if (!fillArea[x, y])

-                        continue;

-

-                    double average = 0.0;

-                    int avgsteps = 0;

-

-                    double n;

-                    for (n = 0.0 - area; n < area; n += step)

-                    {

-                        double l;

-                        for (l = 0.0 - area; l < area; l += step)

-                        {

-                            avgsteps++;

-                            average += GetBilinearInterpolate(x + n, y + l, map);

-                        }

-                    }

-

-                    manipulate[x, y] = average / avgsteps;

-                }

-            }

-            for (x = 0; x < map.Width; x++)

-            {

-                for (y = 0; y < map.Height; y++)

-                {

-                    if (!fillArea[x, y])

-                        continue;

-

-                    map[x, y] = manipulate[x, y];

-                }

-            }

-        }

-

-        #endregion

-

-        private static double GetBilinearInterpolate(double x, double y, ITerrainChannel map)

-        {

-            int w = map.Width;

-            int h = map.Height;

-

-            if (x > w - 2.0)

-                x = w - 2.0;

-            if (y > h - 2.0)

-                y = h - 2.0;

-            if (x < 0.0)

-                x = 0.0;

-            if (y < 0.0)

-                y = 0.0;

-

-            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];

-            double h11 = map[(int) x + stepSize, (int) y + stepSize];

-            double h1 = h00;

-            double h2 = h10;

-            double h3 = h01;

-            double h4 = h11;

-            double a00 = h1;

-            double a10 = h2 - h1;

-            double a01 = h3 - h1;

-            double a11 = h1 - h2 - h3 + h4;

-            double partialx = x - (int) x;

-            double partialz = y - (int) y;

-            double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz);

-            return hi;

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
+{
+    public class SmoothArea : ITerrainFloodEffect
+    {
+        #region ITerrainFloodEffect Members
+
+        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
+        {
+            double area = strength;
+            double step = strength / 4.0;
+
+            double[,] manipulate = new double[map.Width,map.Height];
+            int x, y;
+            for (x = 0; x < map.Width; x++)
+            {
+                for (y = 0; y < map.Height; y++)
+                {
+                    if (!fillArea[x, y])
+                        continue;
+
+                    double average = 0.0;
+                    int avgsteps = 0;
+
+                    double n;
+                    for (n = 0.0 - area; n < area; n += step)
+                    {
+                        double l;
+                        for (l = 0.0 - area; l < area; l += step)
+                        {
+                            avgsteps++;
+                            average += GetBilinearInterpolate(x + n, y + l, map);
+                        }
+                    }
+
+                    manipulate[x, y] = average / avgsteps;
+                }
+            }
+            for (x = 0; x < map.Width; x++)
+            {
+                for (y = 0; y < map.Height; y++)
+                {
+                    if (!fillArea[x, y])
+                        continue;
+
+                    map[x, y] = manipulate[x, y];
+                }
+            }
+        }
+
+        #endregion
+
+        private static double GetBilinearInterpolate(double x, double y, ITerrainChannel map)
+        {
+            int w = map.Width;
+            int h = map.Height;
+
+            if (x > w - 2.0)
+                x = w - 2.0;
+            if (y > h - 2.0)
+                y = h - 2.0;
+            if (x < 0.0)
+                x = 0.0;
+            if (y < 0.0)
+                y = 0.0;
+
+            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];
+            double h11 = map[(int) x + stepSize, (int) y + stepSize];
+            double h1 = h00;
+            double h2 = h10;
+            double h3 = h01;
+            double h4 = h11;
+            double a00 = h1;
+            double a10 = h2 - h1;
+            double a01 = h3 - h1;
+            double a11 = h1 - h2 - h3 + h4;
+            double partialx = x - (int) x;
+            double partialz = y - (int) y;
+            double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz);
+            return hi;
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs
index 821fc4b..bbbe2a3 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs
@@ -1,36 +1,36 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain

-{

-    public interface ITerrainEffect

-    {

-        void RunEffect(ITerrainChannel map);

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain
+{
+    public interface ITerrainEffect
+    {
+        void RunEffect(ITerrainChannel map);
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs
index 6b0d7f9..9fe93a2 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs
@@ -1,37 +1,37 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using System;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain

-{

-    public interface ITerrainFloodEffect

-    {

-        void FloodEffect(ITerrainChannel map, Boolean[,] fillArea, double strength);

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain
+{
+    public interface ITerrainFloodEffect
+    {
+        void FloodEffect(ITerrainChannel map, Boolean[,] fillArea, double strength);
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs
index 6211892..4c16c1c 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs
@@ -1,39 +1,39 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain

-{

-    public interface ITerrainLoader

-    {

-        string FileExtension { get; }

-        ITerrainChannel LoadFile(string filename);

-        ITerrainChannel LoadFile(string filename, int fileStartX, int fileStartY, int fileWidth, int fileHeight, int sectionWidth, int sectionHeight);

-        void SaveFile(string filename, ITerrainChannel map);

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain
+{
+    public interface ITerrainLoader
+    {
+        string FileExtension { get; }
+        ITerrainChannel LoadFile(string filename);
+        ITerrainChannel LoadFile(string filename, int fileStartX, int fileStartY, int fileWidth, int fileHeight, int sectionWidth, int sectionHeight);
+        void SaveFile(string filename, ITerrainChannel map);
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainModule.cs b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainModule.cs
index 756354a..224cc3a 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainModule.cs
@@ -1,8 +1,8 @@
-namespace OpenSim.Region.Environment.Modules.World.Terrain

-{

-    public interface ITerrainModule

-    {

-        void LoadFromFile(string filename);

-        void SaveToFile(string filename);

-    }

+namespace OpenSim.Region.Environment.Modules.World.Terrain
+{
+    public interface ITerrainModule
+    {
+        void LoadFromFile(string filename);
+        void SaveToFile(string filename);
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs
index d73f44d..cf2e58a 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs
@@ -1,36 +1,36 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain

-{

-    public interface ITerrainPaintableEffect

-    {

-        void PaintEffect(ITerrainChannel map, double x, double y, double strength, double duration);

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain
+{
+    public interface ITerrainPaintableEffect
+    {
+        void PaintEffect(ITerrainChannel map, double x, double y, double strength, double duration);
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/MapImageModule.cs b/OpenSim/Region/Environment/Modules/World/Terrain/MapImageModule.cs
index dbaec0f..fe26902 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/MapImageModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/MapImageModule.cs
@@ -1,168 +1,168 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using System;

-using System.Drawing;

-using Nini.Config;

-using OpenJPEGNet;

-using OpenSim.Region.Environment.Interfaces;

-using OpenSim.Region.Environment.Scenes;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain

-{

-    internal class MapImageModule : IMapImageGenerator, IRegionModule

-    {

-        private Scene m_scene;

-

-        #region IMapImageGenerator Members

-

-        public byte[] WriteJpeg2000Image(string gradientmap)

-        {

-            byte[] imageData = null;

-

-            Bitmap bmp = TerrainToBitmap(gradientmap);

-

-            try

-            {

-                imageData = OpenJPEG.EncodeFromImage(bmp, true);

-            }

-            catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke

-            {

-                Console.WriteLine("Failed generating terrain map: " + e);

-            }

-

-            return imageData;

-        }

-

-        #endregion

-

-        #region IRegionModule Members

-

-        public void Initialise(Scene scene, IConfigSource source)

-        {

-            m_scene = scene;

-            m_scene.RegisterModuleInterface<IMapImageGenerator>(this);

-        }

-

-        public void PostInitialise()

-        {

-        }

-

-        public void Close()

-        {

-        }

-

-        public string Name

-        {

-            get { return "MapImageModule"; }

-        }

-

-        public bool IsSharedModule

-        {

-            get { return false; }

-        }

-

-        #endregion

-

-        private void ShadeBuildings(ref Bitmap map)

-        {

-            lock (map)

-            {

-                lock (m_scene.Entities)

-                {

-                    foreach (EntityBase entity in m_scene.Entities.Values)

-                    {

-                        if (entity is SceneObjectGroup)

-                        {

-                            SceneObjectGroup sog = (SceneObjectGroup) entity;

-

-                            foreach (SceneObjectPart primitive in sog.Children.Values)

-                            {

-                                int x, y, w, h;

-                                x = (int) (primitive.AbsolutePosition.X - (primitive.Scale.X / 2));

-                                y = (int) (primitive.AbsolutePosition.Y - (primitive.Scale.Y / 2));

-                                w = (int) primitive.Scale.X;

-                                h = (int) primitive.Scale.Y;

-

-                                int dx;

-                                for (dx = x; dx < x + w; dx++)

-                                {

-                                    int dy;

-                                    for (dy = y; dy < y + h; dy++)

-                                    {

-                                        if (x < 0 || y < 0)

-                                            continue;

-                                        if (x >= map.Width || y >= map.Height)

-                                            continue;

-

-                                        map.SetPixel(dx, dy, Color.DarkGray);

-                                    }

-                                }

-                            }

-                        }

-                    }

-                }

-            }

-        }

-

-        private Bitmap TerrainToBitmap(string gradientmap)

-        {

-            Bitmap gradientmapLd = new Bitmap(gradientmap);

-

-            int pallete = gradientmapLd.Height;

-

-            Bitmap bmp = new Bitmap(m_scene.Heightmap.Width, m_scene.Heightmap.Height);

-            Color[] colours = new Color[pallete];

-

-            for (int i = 0; i < pallete; i++)

-            {

-                colours[i] = gradientmapLd.GetPixel(0, i);

-            }

-

-            lock (m_scene.Heightmap)

-            {

-                ITerrainChannel copy = m_scene.Heightmap;

-                for (int y = 0; y < copy.Height; y++)

-                {

-                    for (int x = 0; x < copy.Width; x++)

-                    {

-                        // 512 is the largest possible height before colours clamp

-                        int colorindex = (int) (Math.Max(Math.Min(1.0, copy[x, y] / 512.0), 0.0) * (pallete - 1));

-

-                        // Handle error conditions

-                        if (colorindex > pallete - 1 || colorindex < 0)

-                            bmp.SetPixel(x, copy.Height - y - 1, Color.Red);

-                        else

-                            bmp.SetPixel(x, copy.Height - y - 1, colours[colorindex]);

-                    }

-                }

-                ShadeBuildings(ref bmp);

-                return bmp;

-            }

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Drawing;
+using Nini.Config;
+using OpenJPEGNet;
+using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Scenes;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain
+{
+    internal class MapImageModule : IMapImageGenerator, IRegionModule
+    {
+        private Scene m_scene;
+
+        #region IMapImageGenerator Members
+
+        public byte[] WriteJpeg2000Image(string gradientmap)
+        {
+            byte[] imageData = null;
+
+            Bitmap bmp = TerrainToBitmap(gradientmap);
+
+            try
+            {
+                imageData = OpenJPEG.EncodeFromImage(bmp, true);
+            }
+            catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke
+            {
+                Console.WriteLine("Failed generating terrain map: " + e);
+            }
+
+            return imageData;
+        }
+
+        #endregion
+
+        #region IRegionModule Members
+
+        public void Initialise(Scene scene, IConfigSource source)
+        {
+            m_scene = scene;
+            m_scene.RegisterModuleInterface<IMapImageGenerator>(this);
+        }
+
+        public void PostInitialise()
+        {
+        }
+
+        public void Close()
+        {
+        }
+
+        public string Name
+        {
+            get { return "MapImageModule"; }
+        }
+
+        public bool IsSharedModule
+        {
+            get { return false; }
+        }
+
+        #endregion
+
+        private void ShadeBuildings(ref Bitmap map)
+        {
+            lock (map)
+            {
+                lock (m_scene.Entities)
+                {
+                    foreach (EntityBase entity in m_scene.Entities.Values)
+                    {
+                        if (entity is SceneObjectGroup)
+                        {
+                            SceneObjectGroup sog = (SceneObjectGroup) entity;
+
+                            foreach (SceneObjectPart primitive in sog.Children.Values)
+                            {
+                                int x, y, w, h;
+                                x = (int) (primitive.AbsolutePosition.X - (primitive.Scale.X / 2));
+                                y = (int) (primitive.AbsolutePosition.Y - (primitive.Scale.Y / 2));
+                                w = (int) primitive.Scale.X;
+                                h = (int) primitive.Scale.Y;
+
+                                int dx;
+                                for (dx = x; dx < x + w; dx++)
+                                {
+                                    int dy;
+                                    for (dy = y; dy < y + h; dy++)
+                                    {
+                                        if (x < 0 || y < 0)
+                                            continue;
+                                        if (x >= map.Width || y >= map.Height)
+                                            continue;
+
+                                        map.SetPixel(dx, dy, Color.DarkGray);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private Bitmap TerrainToBitmap(string gradientmap)
+        {
+            Bitmap gradientmapLd = new Bitmap(gradientmap);
+
+            int pallete = gradientmapLd.Height;
+
+            Bitmap bmp = new Bitmap(m_scene.Heightmap.Width, m_scene.Heightmap.Height);
+            Color[] colours = new Color[pallete];
+
+            for (int i = 0; i < pallete; i++)
+            {
+                colours[i] = gradientmapLd.GetPixel(0, i);
+            }
+
+            lock (m_scene.Heightmap)
+            {
+                ITerrainChannel copy = m_scene.Heightmap;
+                for (int y = 0; y < copy.Height; y++)
+                {
+                    for (int x = 0; x < copy.Width; x++)
+                    {
+                        // 512 is the largest possible height before colours clamp
+                        int colorindex = (int) (Math.Max(Math.Min(1.0, copy[x, y] / 512.0), 0.0) * (pallete - 1));
+
+                        // Handle error conditions
+                        if (colorindex > pallete - 1 || colorindex < 0)
+                            bmp.SetPixel(x, copy.Height - y - 1, Color.Red);
+                        else
+                            bmp.SetPixel(x, copy.Height - y - 1, colours[colorindex]);
+                    }
+                }
+                ShadeBuildings(ref bmp);
+                return bmp;
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs
index 29448aa..e036988 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs
@@ -1,312 +1,312 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using System;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes

-{

-    /// <summary>

-    /// Hydraulic Erosion Brush

-    /// </summary>

-    public class ErodeSphere : ITerrainPaintableEffect

-    {

-        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 int[] Neighbours(NeighbourSystem type, int index)

-        {

-            int[] coord = new int[2];

-

-            index++;

-

-            switch (type)

-            {

-                case NeighbourSystem.Moore:

-                    switch (index)

-                    {

-                        case 1:

-                            coord[0] = -1;

-                            coord[1] = -1;

-                            break;

-

-                        case 2:

-                            coord[0] = -0;

-                            coord[1] = -1;

-                            break;

-

-                        case 3:

-                            coord[0] = +1;

-                            coord[1] = -1;

-                            break;

-

-                        case 4:

-                            coord[0] = -1;

-                            coord[1] = -0;

-                            break;

-

-                        case 5:

-                            coord[0] = -0;

-                            coord[1] = -0;

-                            break;

-

-                        case 6:

-                            coord[0] = +1;

-                            coord[1] = -0;

-                            break;

-

-                        case 7:

-                            coord[0] = -1;

-                            coord[1] = +1;

-                            break;

-

-                        case 8:

-                            coord[0] = -0;

-                            coord[1] = +1;

-                            break;

-

-                        case 9:

-                            coord[0] = +1;

-                            coord[1] = +1;

-                            break;

-

-                        default:

-                            break;

-                    }

-                    break;

-

-                case NeighbourSystem.VonNeumann:

-                    switch (index)

-                    {

-                        case 1:

-                            coord[0] = 0;

-                            coord[1] = -1;

-                            break;

-

-                        case 2:

-                            coord[0] = -1;

-                            coord[1] = 0;

-                            break;

-

-                        case 3:

-                            coord[0] = +1;

-                            coord[1] = 0;

-                            break;

-

-                        case 4:

-                            coord[0] = 0;

-                            coord[1] = +1;

-                            break;

-

-                        case 5:

-                            coord[0] = -0;

-                            coord[1] = -0;

-                            break;

-

-                        default:

-                            break;

-                    }

-                    break;

-            }

-

-            return coord;

-        }

-

-        private enum NeighbourSystem

-        {

-            Moore,

-            VonNeumann

-        } ;

-

-        #endregion

-

-        #region ITerrainPaintableEffect Members

-

-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)

-        {

-            strength = TerrainUtil.MetersToSphericalStrength(strength);

-

-            int x, y;

-            // Using one 'rain' round for this, so skipping a useless loop

-            // Will need to adapt back in for the Flood brush

-

-            ITerrainChannel water = new TerrainChannel(map.Width, map.Height);

-            ITerrainChannel sediment = new TerrainChannel(map.Width, map.Height);

-

-            // Fill with rain

-            for (x = 0; x < water.Width; x++)

-                for (y = 0; y < water.Height; y++)

-                    water[x, y] = Math.Max(0.0, TerrainUtil.SphericalFactor(x, y, rx, ry, strength) * rainHeight * duration);

-

-            for (int i = 0; i < rounds; i++)

-            {

-                // Erode underlying terrain

-                for (x = 0; x < water.Width; x++)

-                {

-                    for (y = 0; y < water.Height; y++)

-                    {

-                        double solConst = (1.0 / rounds);

-                        double sedDelta = water[x, y] * solConst;

-                        map[x, y] -= sedDelta;

-                        sediment[x, y] += sedDelta;

-                    }

-                }

-

-                // Move water

-                for (x = 0; x < water.Width; x++)

-                {

-                    for (y = 0; y < water.Height; y++)

-                    {

-                        if (water[x, y] <= 0)

-                            continue;

-

-                        // Step 1. Calculate average of neighbours

-

-                        int neighbours = 0;

-                        double altitudeTotal = 0.0;

-                        double altitudeMe = map[x, y] + water[x, y];

-

-                        int NEIGHBOUR_ME = 4;

-

-                        int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;

-

-                        for (int j = 0; j < NEIGHBOUR_MAX; j++)

-                        {

-                            if (j != NEIGHBOUR_ME)

-                            {

-                                int[] coords = Neighbours(type, j);

-

-                                coords[0] += x;

-                                coords[1] += y;

-

-                                if (coords[0] > map.Width - 1)

-                                    continue;

-                                if (coords[1] > map.Height - 1)

-                                    continue;

-                                if (coords[0] < 0)

-                                    continue;

-                                if (coords[1] < 0)

-                                    continue;

-

-                                // Calculate total height of this neighbour

-                                double altitudeNeighbour = water[coords[0], coords[1]] + map[coords[0], coords[1]];

-

-                                // If it's greater than me...

-                                if (altitudeNeighbour - altitudeMe < 0)

-                                {

-                                    // Add it to our calculations

-                                    neighbours++;

-                                    altitudeTotal += altitudeNeighbour;

-                                }

-                            }

-                        }

-

-                        if (neighbours == 0)

-                            continue;

-

-                        double altitudeAvg = altitudeTotal / neighbours;

-

-                        // Step 2. Allocate water to neighbours.

-                        for (int j = 0; j < NEIGHBOUR_MAX; j++)

-                        {

-                            if (j != NEIGHBOUR_ME)

-                            {

-                                int[] coords = Neighbours(type, j);

-

-                                coords[0] += x;

-                                coords[1] += y;

-

-                                if (coords[0] > map.Width - 1)

-                                    continue;

-                                if (coords[1] > map.Height - 1)

-                                    continue;

-                                if (coords[0] < 0)

-                                    continue;

-                                if (coords[1] < 0)

-                                    continue;

-

-                                // Skip if we dont have water to begin with.

-                                if (water[x, y] < 0)

-                                    continue;

-

-                                // Calculate our delta average

-                                double altitudeDelta = altitudeMe - altitudeAvg;

-

-                                if (altitudeDelta < 0)

-                                    continue;

-

-                                // 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);

-

-                                double sedimentDelta = sediment[x, y] * (waterDelta / water[x, y]);

-

-                                if (sedimentDelta > 0)

-                                {

-                                    sediment[x, y] -= sedimentDelta;

-                                    sediment[coords[0], coords[1]] += sedimentDelta;

-                                }

-                            }

-                        }

-                    }

-                }

-

-                // Evaporate

-

-                for (x = 0; x < water.Width; x++)

-                {

-                    for (y = 0; y < water.Height; y++)

-                    {

-                        water[x, y] *= 1.0 - (rainHeight / rounds);

-

-                        double waterCapacity = waterSaturation * water[x, y];

-

-                        double sedimentDeposit = sediment[x, y] - waterCapacity;

-                        if (sedimentDeposit > 0)

-                        {

-                            sediment[x, y] -= sedimentDeposit;

-                            map[x, y] += sedimentDeposit;

-                        }

-                    }

-                }

-            }

-

-            // Deposit any remainder (should be minimal)

-            for (x = 0; x < water.Width; x++)

-                for (y = 0; y < water.Height; y++)

-                    if (sediment[x, y] > 0)

-                        map[x, y] += sediment[x, y];

-        }

-

-        #endregion

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+{
+    /// <summary>
+    /// Hydraulic Erosion Brush
+    /// </summary>
+    public class ErodeSphere : ITerrainPaintableEffect
+    {
+        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 int[] Neighbours(NeighbourSystem type, int index)
+        {
+            int[] coord = new int[2];
+
+            index++;
+
+            switch (type)
+            {
+                case NeighbourSystem.Moore:
+                    switch (index)
+                    {
+                        case 1:
+                            coord[0] = -1;
+                            coord[1] = -1;
+                            break;
+
+                        case 2:
+                            coord[0] = -0;
+                            coord[1] = -1;
+                            break;
+
+                        case 3:
+                            coord[0] = +1;
+                            coord[1] = -1;
+                            break;
+
+                        case 4:
+                            coord[0] = -1;
+                            coord[1] = -0;
+                            break;
+
+                        case 5:
+                            coord[0] = -0;
+                            coord[1] = -0;
+                            break;
+
+                        case 6:
+                            coord[0] = +1;
+                            coord[1] = -0;
+                            break;
+
+                        case 7:
+                            coord[0] = -1;
+                            coord[1] = +1;
+                            break;
+
+                        case 8:
+                            coord[0] = -0;
+                            coord[1] = +1;
+                            break;
+
+                        case 9:
+                            coord[0] = +1;
+                            coord[1] = +1;
+                            break;
+
+                        default:
+                            break;
+                    }
+                    break;
+
+                case NeighbourSystem.VonNeumann:
+                    switch (index)
+                    {
+                        case 1:
+                            coord[0] = 0;
+                            coord[1] = -1;
+                            break;
+
+                        case 2:
+                            coord[0] = -1;
+                            coord[1] = 0;
+                            break;
+
+                        case 3:
+                            coord[0] = +1;
+                            coord[1] = 0;
+                            break;
+
+                        case 4:
+                            coord[0] = 0;
+                            coord[1] = +1;
+                            break;
+
+                        case 5:
+                            coord[0] = -0;
+                            coord[1] = -0;
+                            break;
+
+                        default:
+                            break;
+                    }
+                    break;
+            }
+
+            return coord;
+        }
+
+        private enum NeighbourSystem
+        {
+            Moore,
+            VonNeumann
+        } ;
+
+        #endregion
+
+        #region ITerrainPaintableEffect Members
+
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        {
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
+
+            int x, y;
+            // Using one 'rain' round for this, so skipping a useless loop
+            // Will need to adapt back in for the Flood brush
+
+            ITerrainChannel water = new TerrainChannel(map.Width, map.Height);
+            ITerrainChannel sediment = new TerrainChannel(map.Width, map.Height);
+
+            // Fill with rain
+            for (x = 0; x < water.Width; x++)
+                for (y = 0; y < water.Height; y++)
+                    water[x, y] = Math.Max(0.0, TerrainUtil.SphericalFactor(x, y, rx, ry, strength) * rainHeight * duration);
+
+            for (int i = 0; i < rounds; i++)
+            {
+                // Erode underlying terrain
+                for (x = 0; x < water.Width; x++)
+                {
+                    for (y = 0; y < water.Height; y++)
+                    {
+                        double solConst = (1.0 / rounds);
+                        double sedDelta = water[x, y] * solConst;
+                        map[x, y] -= sedDelta;
+                        sediment[x, y] += sedDelta;
+                    }
+                }
+
+                // Move water
+                for (x = 0; x < water.Width; x++)
+                {
+                    for (y = 0; y < water.Height; y++)
+                    {
+                        if (water[x, y] <= 0)
+                            continue;
+
+                        // Step 1. Calculate average of neighbours
+
+                        int neighbours = 0;
+                        double altitudeTotal = 0.0;
+                        double altitudeMe = map[x, y] + water[x, y];
+
+                        int NEIGHBOUR_ME = 4;
+
+                        int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
+
+                        for (int j = 0; j < NEIGHBOUR_MAX; j++)
+                        {
+                            if (j != NEIGHBOUR_ME)
+                            {
+                                int[] coords = Neighbours(type, j);
+
+                                coords[0] += x;
+                                coords[1] += y;
+
+                                if (coords[0] > map.Width - 1)
+                                    continue;
+                                if (coords[1] > map.Height - 1)
+                                    continue;
+                                if (coords[0] < 0)
+                                    continue;
+                                if (coords[1] < 0)
+                                    continue;
+
+                                // Calculate total height of this neighbour
+                                double altitudeNeighbour = water[coords[0], coords[1]] + map[coords[0], coords[1]];
+
+                                // If it's greater than me...
+                                if (altitudeNeighbour - altitudeMe < 0)
+                                {
+                                    // Add it to our calculations
+                                    neighbours++;
+                                    altitudeTotal += altitudeNeighbour;
+                                }
+                            }
+                        }
+
+                        if (neighbours == 0)
+                            continue;
+
+                        double altitudeAvg = altitudeTotal / neighbours;
+
+                        // Step 2. Allocate water to neighbours.
+                        for (int j = 0; j < NEIGHBOUR_MAX; j++)
+                        {
+                            if (j != NEIGHBOUR_ME)
+                            {
+                                int[] coords = Neighbours(type, j);
+
+                                coords[0] += x;
+                                coords[1] += y;
+
+                                if (coords[0] > map.Width - 1)
+                                    continue;
+                                if (coords[1] > map.Height - 1)
+                                    continue;
+                                if (coords[0] < 0)
+                                    continue;
+                                if (coords[1] < 0)
+                                    continue;
+
+                                // Skip if we dont have water to begin with.
+                                if (water[x, y] < 0)
+                                    continue;
+
+                                // Calculate our delta average
+                                double altitudeDelta = altitudeMe - altitudeAvg;
+
+                                if (altitudeDelta < 0)
+                                    continue;
+
+                                // 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);
+
+                                double sedimentDelta = sediment[x, y] * (waterDelta / water[x, y]);
+
+                                if (sedimentDelta > 0)
+                                {
+                                    sediment[x, y] -= sedimentDelta;
+                                    sediment[coords[0], coords[1]] += sedimentDelta;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // Evaporate
+
+                for (x = 0; x < water.Width; x++)
+                {
+                    for (y = 0; y < water.Height; y++)
+                    {
+                        water[x, y] *= 1.0 - (rainHeight / rounds);
+
+                        double waterCapacity = waterSaturation * water[x, y];
+
+                        double sedimentDeposit = sediment[x, y] - waterCapacity;
+                        if (sedimentDeposit > 0)
+                        {
+                            sediment[x, y] -= sedimentDeposit;
+                            map[x, y] += sedimentDeposit;
+                        }
+                    }
+                }
+            }
+
+            // Deposit any remainder (should be minimal)
+            for (x = 0; x < water.Width; x++)
+                for (y = 0; y < water.Height; y++)
+                    if (sediment[x, y] > 0)
+                        map[x, y] += sediment[x, y];
+        }
+
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
index d4f3b9f..dee455f 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
@@ -1,94 +1,94 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes

-{

-    public class FlattenSphere : ITerrainPaintableEffect

-    {

-

-        #region ITerrainPaintableEffect Members

-

-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)

-        {

-            strength = TerrainUtil.MetersToSphericalStrength(strength);

-

-            int x, y;

-            double[,] tweak = new double[map.Width,map.Height];

-

-            double area = strength;

-            double step = strength / 4.0;

-

-            double sum = 0.0;

-            double step2 = 0.0;

-            double avg = 0.0;

-

-            // compute delta map 

-            for (x = 0; x < map.Width; x++)

-            {

-                for (y = 0; y < map.Height; y++)

-                {

-                    double z = SphericalFactor(x, y, rx, ry, strength);

-

-                    if (z > 0) // add in non-zero amount 

-                    {

-                        sum += map[x, y] * z;

-                        step2 += z;

-                    }

-                }

-            }

-

-            avg = sum / step2;

-

-            // blend in map 

-            for (x = 0; x < map.Width; x++)

-            {

-                for (y = 0; y < map.Height; y++)

-                {

-                    double z = SphericalFactor(x, y, rx, ry, strength) * duration;

-

-                    if (z > 0) // add in non-zero amount 

-                    {

-                        if (z > 1.0)

-                            z = 1.0;

-

-                        map[x, y] = (map[x, y] * (1.0 - z)) + (avg * z);

-                    }

-                }

-            }

-        }

-

-        #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;

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+{
+    public class FlattenSphere : ITerrainPaintableEffect
+    {
+
+        #region ITerrainPaintableEffect Members
+
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        {
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
+
+            int x, y;
+            double[,] tweak = new double[map.Width,map.Height];
+
+            double area = strength;
+            double step = strength / 4.0;
+
+            double sum = 0.0;
+            double step2 = 0.0;
+            double avg = 0.0;
+
+            // compute delta map 
+            for (x = 0; x < map.Width; x++)
+            {
+                for (y = 0; y < map.Height; y++)
+                {
+                    double z = SphericalFactor(x, y, rx, ry, strength);
+
+                    if (z > 0) // add in non-zero amount 
+                    {
+                        sum += map[x, y] * z;
+                        step2 += z;
+                    }
+                }
+            }
+
+            avg = sum / step2;
+
+            // blend in map 
+            for (x = 0; x < map.Width; x++)
+            {
+                for (y = 0; y < map.Height; y++)
+                {
+                    double z = SphericalFactor(x, y, rx, ry, strength) * duration;
+
+                    if (z > 0) // add in non-zero amount 
+                    {
+                        if (z > 1.0)
+                            z = 1.0;
+
+                        map[x, y] = (map[x, y] * (1.0 - z)) + (avg * z);
+                    }
+                }
+            }
+        }
+
+        #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/World/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs
index 0b80407..092bd29 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs
@@ -1,67 +1,67 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using System;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes

-{

-    public class LowerSphere : ITerrainPaintableEffect

-    {

-        #region ITerrainPaintableEffect Members

-

-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)

-        {

-            strength = TerrainUtil.MetersToSphericalStrength(strength);

-

-            int x, y;

-            for (x = 0; x < map.Width; x++)

-            {

-                // Skip everything unlikely to be affected

-                if (Math.Abs(x - rx) > strength * 1.1)

-                    continue;

-

-                for (y = 0; y < map.Height; y++)

-                {

-                    // Skip everything unlikely to be affected

-                    if (Math.Abs(y - ry) > strength * 1.1)

-                        continue;

-

-                    // Calculate a sphere and add it to the heighmap

-                    double z = strength;

-                    z *= z;

-                    z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));

-

-                    if (z > 0.0)

-                        map[x, y] -= z * duration;

-                }

-            }

-        }

-

-        #endregion

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+{
+    public class LowerSphere : ITerrainPaintableEffect
+    {
+        #region ITerrainPaintableEffect Members
+
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        {
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
+
+            int x, y;
+            for (x = 0; x < map.Width; x++)
+            {
+                // Skip everything unlikely to be affected
+                if (Math.Abs(x - rx) > strength * 1.1)
+                    continue;
+
+                for (y = 0; y < map.Height; y++)
+                {
+                    // Skip everything unlikely to be affected
+                    if (Math.Abs(y - ry) > strength * 1.1)
+                        continue;
+
+                    // Calculate a sphere and add it to the heighmap
+                    double z = strength;
+                    z *= z;
+                    z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
+
+                    if (z > 0.0)
+                        map[x, y] -= z * duration;
+                }
+            }
+        }
+
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs
index a188e9f..8ae583e 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs
@@ -1,70 +1,70 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using System;

-using OpenSim.Framework;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes

-{

-    public class NoiseSphere : ITerrainPaintableEffect

-    {

-        #region ITerrainPaintableEffect Members

-

-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)

-        {

-            strength = TerrainUtil.MetersToSphericalStrength(strength);

-

-            int x, y;

-            for (x = 0; x < map.Width; x++)

-            {

-                // Skip everything unlikely to be affected

-                if (Math.Abs(x - rx) > strength * 1.1)

-                    continue;

-

-                for (y = 0; y < map.Height; y++)

-                {

-                    // Skip everything unlikely to be affected

-                    if (Math.Abs(y - ry) > strength * 1.1)

-                        continue;

-

-                    // Calculate a sphere and add it to the heighmap

-                    double z = strength;

-                    z *= z;

-                    z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));

-

-                    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;

-                }

-            }

-        }

-

-        #endregion

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenSim.Framework;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+{
+    public class NoiseSphere : ITerrainPaintableEffect
+    {
+        #region ITerrainPaintableEffect Members
+
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        {
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
+
+            int x, y;
+            for (x = 0; x < map.Width; x++)
+            {
+                // Skip everything unlikely to be affected
+                if (Math.Abs(x - rx) > strength * 1.1)
+                    continue;
+
+                for (y = 0; y < map.Height; y++)
+                {
+                    // Skip everything unlikely to be affected
+                    if (Math.Abs(y - ry) > strength * 1.1)
+                        continue;
+
+                    // Calculate a sphere and add it to the heighmap
+                    double z = strength;
+                    z *= z;
+                    z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
+
+                    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;
+                }
+            }
+        }
+
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
index dc56cf1..ba01a01 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
@@ -1,225 +1,225 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using System;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes

-{

-    /// <summary>

-    /// Speed-Optimised Hybrid Erosion Brush

-    /// 

-    /// As per Jacob Olsen's Paper 

-    /// http://www.oddlabs.com/download/terrain_generation.pdf

-    /// </summary>

-    public class OlsenSphere : ITerrainPaintableEffect

-    {

-        private double nConst = 1024.0;

-        private NeighbourSystem type = NeighbourSystem.Moore; // Parameter

-

-        #region Supporting Functions

-

-        private int[] Neighbours(NeighbourSystem type, int index)

-        {

-            int[] coord = new int[2];

-

-            index++;

-

-            switch (type)

-            {

-                case NeighbourSystem.Moore:

-                    switch (index)

-                    {

-                        case 1:

-                            coord[0] = -1;

-                            coord[1] = -1;

-                            break;

-

-                        case 2:

-                            coord[0] = -0;

-                            coord[1] = -1;

-                            break;

-

-                        case 3:

-                            coord[0] = +1;

-                            coord[1] = -1;

-                            break;

-

-                        case 4:

-                            coord[0] = -1;

-                            coord[1] = -0;

-                            break;

-

-                        case 5:

-                            coord[0] = -0;

-                            coord[1] = -0;

-                            break;

-

-                        case 6:

-                            coord[0] = +1;

-                            coord[1] = -0;

-                            break;

-

-                        case 7:

-                            coord[0] = -1;

-                            coord[1] = +1;

-                            break;

-

-                        case 8:

-                            coord[0] = -0;

-                            coord[1] = +1;

-                            break;

-

-                        case 9:

-                            coord[0] = +1;

-                            coord[1] = +1;

-                            break;

-

-                        default:

-                            break;

-                    }

-                    break;

-

-                case NeighbourSystem.VonNeumann:

-                    switch (index)

-                    {

-                        case 1:

-                            coord[0] = 0;

-                            coord[1] = -1;

-                            break;

-

-                        case 2:

-                            coord[0] = -1;

-                            coord[1] = 0;

-                            break;

-

-                        case 3:

-                            coord[0] = +1;

-                            coord[1] = 0;

-                            break;

-

-                        case 4:

-                            coord[0] = 0;

-                            coord[1] = +1;

-                            break;

-

-                        case 5:

-                            coord[0] = -0;

-                            coord[1] = -0;

-                            break;

-

-                        default:

-                            break;

-                    }

-                    break;

-            }

-

-            return coord;

-        }

-

-        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;

-        }

-

-        private enum NeighbourSystem

-        {

-            Moore,

-            VonNeumann

-        } ;

-

-        #endregion

-

-        #region ITerrainPaintableEffect Members

-

-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)

-        {

-            strength = TerrainUtil.MetersToSphericalStrength(strength);

-

-            int x, y;

-

-            for (x = 0; x < map.Width; x++)

-            {

-                for (y = 0; y < map.Height; y++)

-                {

-                    double z = SphericalFactor(x, y, rx, ry, strength);

-

-                    if (z > 0) // add in non-zero amount 

-                    {

-                        int NEIGHBOUR_ME = 4;

-                        int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;

-

-                        double max = Double.MinValue;

-                        int loc = 0;

-                        double cellmax = 0;

-

-

-                        for (int j = 0; j < NEIGHBOUR_MAX; j++)

-                        {

-                            if (j != NEIGHBOUR_ME)

-                            {

-                                int[] coords = Neighbours(type, j);

-

-                                coords[0] += x;

-                                coords[1] += y;

-

-                                if (coords[0] > map.Width - 1)

-                                    continue;

-                                if (coords[1] > map.Height - 1)

-                                    continue;

-                                if (coords[0] < 0)

-                                    continue;

-                                if (coords[1] < 0)

-                                    continue;

-

-                                cellmax = map[x, y] - map[coords[0], coords[1]];

-                                if (cellmax > max)

-                                {

-                                    max = cellmax;

-                                    loc = j;

-                                }

-                            }

-                        }

-

-                        double T = nConst / ((map.Width + map.Height) / 2);

-                        // Apply results

-                        if (0 < max && max <= T)

-                        {

-                            int[] maxCoords = Neighbours(type, loc);

-                            double heightDelta = 0.5 * max * z * duration;

-                            map[x, y] -= heightDelta;

-                            map[x + maxCoords[0], y + maxCoords[1]] += heightDelta;

-                        }

-                    }

-                }

-            }

-        }

-

-        #endregion

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+{
+    /// <summary>
+    /// Speed-Optimised Hybrid Erosion Brush
+    /// 
+    /// As per Jacob Olsen's Paper 
+    /// http://www.oddlabs.com/download/terrain_generation.pdf
+    /// </summary>
+    public class OlsenSphere : ITerrainPaintableEffect
+    {
+        private double nConst = 1024.0;
+        private NeighbourSystem type = NeighbourSystem.Moore; // Parameter
+
+        #region Supporting Functions
+
+        private int[] Neighbours(NeighbourSystem type, int index)
+        {
+            int[] coord = new int[2];
+
+            index++;
+
+            switch (type)
+            {
+                case NeighbourSystem.Moore:
+                    switch (index)
+                    {
+                        case 1:
+                            coord[0] = -1;
+                            coord[1] = -1;
+                            break;
+
+                        case 2:
+                            coord[0] = -0;
+                            coord[1] = -1;
+                            break;
+
+                        case 3:
+                            coord[0] = +1;
+                            coord[1] = -1;
+                            break;
+
+                        case 4:
+                            coord[0] = -1;
+                            coord[1] = -0;
+                            break;
+
+                        case 5:
+                            coord[0] = -0;
+                            coord[1] = -0;
+                            break;
+
+                        case 6:
+                            coord[0] = +1;
+                            coord[1] = -0;
+                            break;
+
+                        case 7:
+                            coord[0] = -1;
+                            coord[1] = +1;
+                            break;
+
+                        case 8:
+                            coord[0] = -0;
+                            coord[1] = +1;
+                            break;
+
+                        case 9:
+                            coord[0] = +1;
+                            coord[1] = +1;
+                            break;
+
+                        default:
+                            break;
+                    }
+                    break;
+
+                case NeighbourSystem.VonNeumann:
+                    switch (index)
+                    {
+                        case 1:
+                            coord[0] = 0;
+                            coord[1] = -1;
+                            break;
+
+                        case 2:
+                            coord[0] = -1;
+                            coord[1] = 0;
+                            break;
+
+                        case 3:
+                            coord[0] = +1;
+                            coord[1] = 0;
+                            break;
+
+                        case 4:
+                            coord[0] = 0;
+                            coord[1] = +1;
+                            break;
+
+                        case 5:
+                            coord[0] = -0;
+                            coord[1] = -0;
+                            break;
+
+                        default:
+                            break;
+                    }
+                    break;
+            }
+
+            return coord;
+        }
+
+        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;
+        }
+
+        private enum NeighbourSystem
+        {
+            Moore,
+            VonNeumann
+        } ;
+
+        #endregion
+
+        #region ITerrainPaintableEffect Members
+
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        {
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
+
+            int x, y;
+
+            for (x = 0; x < map.Width; x++)
+            {
+                for (y = 0; y < map.Height; y++)
+                {
+                    double z = SphericalFactor(x, y, rx, ry, strength);
+
+                    if (z > 0) // add in non-zero amount 
+                    {
+                        int NEIGHBOUR_ME = 4;
+                        int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
+
+                        double max = Double.MinValue;
+                        int loc = 0;
+                        double cellmax = 0;
+
+
+                        for (int j = 0; j < NEIGHBOUR_MAX; j++)
+                        {
+                            if (j != NEIGHBOUR_ME)
+                            {
+                                int[] coords = Neighbours(type, j);
+
+                                coords[0] += x;
+                                coords[1] += y;
+
+                                if (coords[0] > map.Width - 1)
+                                    continue;
+                                if (coords[1] > map.Height - 1)
+                                    continue;
+                                if (coords[0] < 0)
+                                    continue;
+                                if (coords[1] < 0)
+                                    continue;
+
+                                cellmax = map[x, y] - map[coords[0], coords[1]];
+                                if (cellmax > max)
+                                {
+                                    max = cellmax;
+                                    loc = j;
+                                }
+                            }
+                        }
+
+                        double T = nConst / ((map.Width + map.Height) / 2);
+                        // Apply results
+                        if (0 < max && max <= T)
+                        {
+                            int[] maxCoords = Neighbours(type, loc);
+                            double heightDelta = 0.5 * max * z * duration;
+                            map[x, y] -= heightDelta;
+                            map[x + maxCoords[0], y + maxCoords[1]] += heightDelta;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs
index cd5a22b..5d6f093 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs
@@ -1,67 +1,67 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using System;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes

-{

-    public class RaiseSphere : ITerrainPaintableEffect

-    {

-        #region ITerrainPaintableEffect Members

-

-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)

-        {

-            strength = TerrainUtil.MetersToSphericalStrength(strength);

-

-            int x, y;

-            for (x = 0; x < map.Width; x++)

-            {

-                // Skip everything unlikely to be affected

-                if (Math.Abs(x - rx) > strength * 1.1)

-                    continue;

-

-                for (y = 0; y < map.Height; y++)

-                {

-                    // Skip everything unlikely to be affected

-                    if (Math.Abs(y - ry) > strength * 1.1)

-                        continue;

-

-                    // Calculate a sphere and add it to the heighmap

-                    double z = strength;

-                    z *= z;

-                    z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));

-

-                    if (z > 0.0)

-                        map[x, y] += z * duration;

-                }

-            }

-        }

-

-        #endregion

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+{
+    public class RaiseSphere : ITerrainPaintableEffect
+    {
+        #region ITerrainPaintableEffect Members
+
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        {
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
+
+            int x, y;
+            for (x = 0; x < map.Width; x++)
+            {
+                // Skip everything unlikely to be affected
+                if (Math.Abs(x - rx) > strength * 1.1)
+                    continue;
+
+                for (y = 0; y < map.Height; y++)
+                {
+                    // Skip everything unlikely to be affected
+                    if (Math.Abs(y - ry) > strength * 1.1)
+                        continue;
+
+                    // Calculate a sphere and add it to the heighmap
+                    double z = strength;
+                    z *= z;
+                    z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
+
+                    if (z > 0.0)
+                        map[x, y] += z * duration;
+                }
+            }
+        }
+
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs
index 5b92cb5..b47e041 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs
@@ -1,82 +1,82 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using System;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes

-{

-    public class RevertSphere : ITerrainPaintableEffect

-    {

-        private ITerrainChannel m_revertmap;

-

-        public RevertSphere(ITerrainChannel revertmap)

-        {

-            m_revertmap = revertmap;

-        }

-

-        #region ITerrainPaintableEffect Members

-

-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)

-        {

-            strength = TerrainUtil.MetersToSphericalStrength(strength);

-

-            if (duration > 1.0)

-                duration = 1.0;

-            if (duration < 0)

-                return;

-

-            int x, y;

-            for (x = 0; x < map.Width; x++)

-            {

-                // Skip everything unlikely to be affected

-                if (Math.Abs(x - rx) > strength * 1.1)

-                    continue;

-

-                for (y = 0; y < map.Height; y++)

-                {

-                    // Skip everything unlikely to be affected

-                    if (Math.Abs(y - ry) > strength * 1.1)

-                        continue;

-

-                    // Calculate a sphere and add it to the heighmap

-                    double z = strength;

-                    z *= z;

-                    z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));

-

-                    if (z > 0.0)

-                    {

-                        z *= duration;

-                        map[x, y] += (map[x, y] * (1.0 - z)) + (m_revertmap[x, y] * z);

-                    }

-                }

-            }

-        }

-

-        #endregion

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+{
+    public class RevertSphere : ITerrainPaintableEffect
+    {
+        private ITerrainChannel m_revertmap;
+
+        public RevertSphere(ITerrainChannel revertmap)
+        {
+            m_revertmap = revertmap;
+        }
+
+        #region ITerrainPaintableEffect Members
+
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        {
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
+
+            if (duration > 1.0)
+                duration = 1.0;
+            if (duration < 0)
+                return;
+
+            int x, y;
+            for (x = 0; x < map.Width; x++)
+            {
+                // Skip everything unlikely to be affected
+                if (Math.Abs(x - rx) > strength * 1.1)
+                    continue;
+
+                for (y = 0; y < map.Height; y++)
+                {
+                    // Skip everything unlikely to be affected
+                    if (Math.Abs(y - ry) > strength * 1.1)
+                        continue;
+
+                    // Calculate a sphere and add it to the heighmap
+                    double z = strength;
+                    z *= z;
+                    z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
+
+                    if (z > 0.0)
+                    {
+                        z *= duration;
+                        map[x, y] += (map[x, y] * (1.0 - z)) + (m_revertmap[x, y] * z);
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
index 305a875..51d5f0e 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
@@ -1,93 +1,93 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes

-{

-    public class SmoothSphere : ITerrainPaintableEffect

-    {

-        #region ITerrainPaintableEffect Members

-

-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)

-        {

-            strength = TerrainUtil.MetersToSphericalStrength(strength);

-

-            int x, y;

-            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)

-                            {

-                                avgsteps++;

-                                average += TerrainUtil.GetBilinearInterpolate(x + n, y + l, map);

-                            }

-                        }

-                        tweak[x, y] = average / avgsteps;

-                    }

-                }

-            }

-            // blend in 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 da = z;

-                        double a = (map[x, y] - tweak[x, y]) * da;

-                        double newz = map[x, y] - (a * duration);

-

-                        if (newz > 0.0)

-                            map[x, y] = newz;

-                    }

-                }

-            }

-        }

-

-        #endregion

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+{
+    public class SmoothSphere : ITerrainPaintableEffect
+    {
+        #region ITerrainPaintableEffect Members
+
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        {
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
+
+            int x, y;
+            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)
+                            {
+                                avgsteps++;
+                                average += TerrainUtil.GetBilinearInterpolate(x + n, y + l, map);
+                            }
+                        }
+                        tweak[x, y] = average / avgsteps;
+                    }
+                }
+            }
+            // blend in 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 da = z;
+                        double a = (map[x, y] - tweak[x, y]) * da;
+                        double newz = map[x, y] - (a * duration);
+
+                        if (newz > 0.0)
+                            map[x, y] = newz;
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs
index 2d81054..b48beb8 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs
@@ -1,207 +1,207 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes

-{

-    /// <summary>

-    /// Thermal Weathering Paint Brush

-    /// </summary>

-    public class WeatherSphere : ITerrainPaintableEffect

-    {

-        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 int[] Neighbours(NeighbourSystem type, int index)

-        {

-            int[] coord = new int[2];

-

-            index++;

-

-            switch (type)

-            {

-                case NeighbourSystem.Moore:

-                    switch (index)

-                    {

-                        case 1:

-                            coord[0] = -1;

-                            coord[1] = -1;

-                            break;

-

-                        case 2:

-                            coord[0] = -0;

-                            coord[1] = -1;

-                            break;

-

-                        case 3:

-                            coord[0] = +1;

-                            coord[1] = -1;

-                            break;

-

-                        case 4:

-                            coord[0] = -1;

-                            coord[1] = -0;

-                            break;

-

-                        case 5:

-                            coord[0] = -0;

-                            coord[1] = -0;

-                            break;

-

-                        case 6:

-                            coord[0] = +1;

-                            coord[1] = -0;

-                            break;

-

-                        case 7:

-                            coord[0] = -1;

-                            coord[1] = +1;

-                            break;

-

-                        case 8:

-                            coord[0] = -0;

-                            coord[1] = +1;

-                            break;

-

-                        case 9:

-                            coord[0] = +1;

-                            coord[1] = +1;

-                            break;

-

-                        default:

-                            break;

-                    }

-                    break;

-

-                case NeighbourSystem.VonNeumann:

-                    switch (index)

-                    {

-                        case 1:

-                            coord[0] = 0;

-                            coord[1] = -1;

-                            break;

-

-                        case 2:

-                            coord[0] = -1;

-                            coord[1] = 0;

-                            break;

-

-                        case 3:

-                            coord[0] = +1;

-                            coord[1] = 0;

-                            break;

-

-                        case 4:

-                            coord[0] = 0;

-                            coord[1] = +1;

-                            break;

-

-                        case 5:

-                            coord[0] = -0;

-                            coord[1] = -0;

-                            break;

-

-                        default:

-                            break;

-                    }

-                    break;

-            }

-

-            return coord;

-        }

-

-        private enum NeighbourSystem

-        {

-            Moore,

-            VonNeumann

-        } ;

-

-        #endregion

-

-        #region ITerrainPaintableEffect Members

-

-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)

-        {

-            strength = TerrainUtil.MetersToSphericalStrength(strength);

-

-            int x, y;

-

-            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 

-                    {

-                        int NEIGHBOUR_ME = 4;

-

-                        int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;

-

-                        for (int j = 0; j < NEIGHBOUR_MAX; j++)

-                        {

-                            if (j != NEIGHBOUR_ME)

-                            {

-                                int[] coords = Neighbours(type, j);

-

-                                coords[0] += x;

-                                coords[1] += y;

-

-                                if (coords[0] > map.Width - 1)

-                                    continue;

-                                if (coords[1] > map.Height - 1)

-                                    continue;

-                                if (coords[0] < 0)

-                                    continue;

-                                if (coords[1] < 0)

-                                    continue;

-

-                                double heightF = map[x, y];

-                                double target = map[coords[0], coords[1]];

-

-                                if (target > heightF + talus)

-                                {

-                                    double calc = duration * ((target - heightF) - talus) * z;

-                                    heightF += calc;

-                                    target -= calc;

-                                }

-

-                                map[x, y] = heightF;

-                                map[coords[0], coords[1]] = target;

-                            }

-                        }

-                    }

-                }

-            }

-        }

-

-        #endregion

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+{
+    /// <summary>
+    /// Thermal Weathering Paint Brush
+    /// </summary>
+    public class WeatherSphere : ITerrainPaintableEffect
+    {
+        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 int[] Neighbours(NeighbourSystem type, int index)
+        {
+            int[] coord = new int[2];
+
+            index++;
+
+            switch (type)
+            {
+                case NeighbourSystem.Moore:
+                    switch (index)
+                    {
+                        case 1:
+                            coord[0] = -1;
+                            coord[1] = -1;
+                            break;
+
+                        case 2:
+                            coord[0] = -0;
+                            coord[1] = -1;
+                            break;
+
+                        case 3:
+                            coord[0] = +1;
+                            coord[1] = -1;
+                            break;
+
+                        case 4:
+                            coord[0] = -1;
+                            coord[1] = -0;
+                            break;
+
+                        case 5:
+                            coord[0] = -0;
+                            coord[1] = -0;
+                            break;
+
+                        case 6:
+                            coord[0] = +1;
+                            coord[1] = -0;
+                            break;
+
+                        case 7:
+                            coord[0] = -1;
+                            coord[1] = +1;
+                            break;
+
+                        case 8:
+                            coord[0] = -0;
+                            coord[1] = +1;
+                            break;
+
+                        case 9:
+                            coord[0] = +1;
+                            coord[1] = +1;
+                            break;
+
+                        default:
+                            break;
+                    }
+                    break;
+
+                case NeighbourSystem.VonNeumann:
+                    switch (index)
+                    {
+                        case 1:
+                            coord[0] = 0;
+                            coord[1] = -1;
+                            break;
+
+                        case 2:
+                            coord[0] = -1;
+                            coord[1] = 0;
+                            break;
+
+                        case 3:
+                            coord[0] = +1;
+                            coord[1] = 0;
+                            break;
+
+                        case 4:
+                            coord[0] = 0;
+                            coord[1] = +1;
+                            break;
+
+                        case 5:
+                            coord[0] = -0;
+                            coord[1] = -0;
+                            break;
+
+                        default:
+                            break;
+                    }
+                    break;
+            }
+
+            return coord;
+        }
+
+        private enum NeighbourSystem
+        {
+            Moore,
+            VonNeumann
+        } ;
+
+        #endregion
+
+        #region ITerrainPaintableEffect Members
+
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        {
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
+
+            int x, y;
+
+            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 
+                    {
+                        int NEIGHBOUR_ME = 4;
+
+                        int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
+
+                        for (int j = 0; j < NEIGHBOUR_MAX; j++)
+                        {
+                            if (j != NEIGHBOUR_ME)
+                            {
+                                int[] coords = Neighbours(type, j);
+
+                                coords[0] += x;
+                                coords[1] += y;
+
+                                if (coords[0] > map.Width - 1)
+                                    continue;
+                                if (coords[1] > map.Height - 1)
+                                    continue;
+                                if (coords[0] < 0)
+                                    continue;
+                                if (coords[1] < 0)
+                                    continue;
+
+                                double heightF = map[x, y];
+                                double target = map[coords[0], coords[1]];
+
+                                if (target > heightF + talus)
+                                {
+                                    double calc = duration * ((target - heightF) - talus) * z;
+                                    heightF += calc;
+                                    target -= calc;
+                                }
+
+                                map[x, y] = heightF;
+                                map[coords[0], coords[1]] = target;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
index e2df885..4f7d20c 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
@@ -1,157 +1,157 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using OpenSim.Framework;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain

-{

-    /// <summary>

-    /// A new version of the old Channel class, simplified

-    /// </summary>

-    public class TerrainChannel : ITerrainChannel

-    {

-        private readonly bool[,] taint;

-        private double[,] map;

-

-        public TerrainChannel()

-        {

-            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 TerrainChannel(double[,] import)

-        {

-            map = import;

-            taint = new bool[import.GetLength(0),import.GetLength(1)];

-        }

-

-        public TerrainChannel(bool createMap)

-        {

-            if (createMap)

-            {

-                map = new double[Constants.RegionSize,Constants.RegionSize];

-                taint = new bool[Constants.RegionSize / 16,Constants.RegionSize / 16];

-            }

-        }

-

-        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[,]) map.Clone();

-

-            return copy;

-        }

-

-        public float[] GetFloatsSerialised()

-        {

-            float[] heights = new float[Width * Height];

-            int i;

-

-            for (i = 0; i < Width * Height; i++)

-            {

-                heights[i] = (float) map[i % Width, i / Width];

-            }

-

-            return heights;

-        }

-

-        public double[,] GetDoubles()

-        {

-            return map;

-        }

-

-        public double this[int x, int y]

-        {

-            get { return map[x, y]; }

-            set

-            {

-                if (map[x, y] != value)

-                {

-                    taint[x / 16, y / 16] = true;

-                    map[x, y] = value;

-                }

-            }

-        }

-

-        public bool Tainted(int x, int y)

-        {

-            if (taint[x / 16, y / 16])

-            {

-                taint[x / 16, y / 16] = false;

-                return true;

-            }

-            else

-            {

-                return false;

-            }

-        }

-

-        #endregion

-

-        public TerrainChannel Copy()

-        {

-            TerrainChannel copy = new TerrainChannel(false);

-            copy.map = (double[,]) map.Clone();

-

-            return copy;

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Framework;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain
+{
+    /// <summary>
+    /// A new version of the old Channel class, simplified
+    /// </summary>
+    public class TerrainChannel : ITerrainChannel
+    {
+        private readonly bool[,] taint;
+        private double[,] map;
+
+        public TerrainChannel()
+        {
+            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 TerrainChannel(double[,] import)
+        {
+            map = import;
+            taint = new bool[import.GetLength(0),import.GetLength(1)];
+        }
+
+        public TerrainChannel(bool createMap)
+        {
+            if (createMap)
+            {
+                map = new double[Constants.RegionSize,Constants.RegionSize];
+                taint = new bool[Constants.RegionSize / 16,Constants.RegionSize / 16];
+            }
+        }
+
+        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[,]) map.Clone();
+
+            return copy;
+        }
+
+        public float[] GetFloatsSerialised()
+        {
+            float[] heights = new float[Width * Height];
+            int i;
+
+            for (i = 0; i < Width * Height; i++)
+            {
+                heights[i] = (float) map[i % Width, i / Width];
+            }
+
+            return heights;
+        }
+
+        public double[,] GetDoubles()
+        {
+            return map;
+        }
+
+        public double this[int x, int y]
+        {
+            get { return map[x, y]; }
+            set
+            {
+                if (map[x, y] != value)
+                {
+                    taint[x / 16, y / 16] = true;
+                    map[x, y] = value;
+                }
+            }
+        }
+
+        public bool Tainted(int x, int y)
+        {
+            if (taint[x / 16, y / 16])
+            {
+                taint[x / 16, y / 16] = false;
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        #endregion
+
+        public TerrainChannel Copy()
+        {
+            TerrainChannel copy = new TerrainChannel(false);
+            copy.map = (double[,]) map.Clone();
+
+            return copy;
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainException.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainException.cs
index 1095cb9..f5c0fe4 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainException.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainException.cs
@@ -1,46 +1,46 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using System;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain

-{

-    public class TerrainException : Exception

-    {

-        public TerrainException() : base()

-        {

-        }

-

-        public TerrainException(string msg) : base(msg)

-        {

-        }

-

-        public TerrainException(string msg, Exception e) : base(msg, e)

-        {

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain
+{
+    public class TerrainException : Exception
+    {
+        public TerrainException() : base()
+        {
+        }
+
+        public TerrainException(string msg) : base(msg)
+        {
+        }
+
+        public TerrainException(string msg, Exception e) : base(msg, e)
+        {
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
index 09c3117..eff6159 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
@@ -1,736 +1,736 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using System;

-using System.Collections.Generic;

-using System.IO;

-using System.Reflection;

-using libsecondlife;

-using log4net;

-using Nini.Config;

-using OpenSim.Framework;

-using OpenSim.Region.Environment.Interfaces;

-using OpenSim.Region.Environment.Modules.Framework;

-using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;

-using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes;

-using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;

-using OpenSim.Region.Environment.Scenes;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain

-{

-    public class TerrainModule : IRegionModule, ICommandableModule, ITerrainModule

-    {

-        #region StandardTerrainEffects enum

-

-        /// <summary>

-        /// A standard set of terrain brushes and effects recognised by viewers

-        /// </summary>

-        public enum StandardTerrainEffects : byte

-        {

-            Flatten = 0,

-            Raise = 1,

-            Lower = 2,

-            Smooth = 3,

-            Noise = 4,

-            Revert = 5,

-

-            // Extended brushes

-            Erode = 255,

-            Weather = 254,

-            Olsen = 253

-        }

-

-        #endregion

-

-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

-

-        private readonly Commander m_commander = new Commander("Terrain");

-

-        private readonly Dictionary<StandardTerrainEffects, ITerrainFloodEffect> m_floodeffects =

-            new Dictionary<StandardTerrainEffects, ITerrainFloodEffect>();

-

-        private readonly Dictionary<string, ITerrainLoader> m_loaders = new Dictionary<string, ITerrainLoader>();

-

-        private readonly Dictionary<StandardTerrainEffects, ITerrainPaintableEffect> m_painteffects =

-            new Dictionary<StandardTerrainEffects, ITerrainPaintableEffect>();

-

-        private ITerrainChannel m_channel;

-        private Dictionary<Location, ITerrainChannel> m_channels;

-        private Dictionary<string, ITerrainEffect> m_plugineffects;

-        private ITerrainChannel m_revert;

-        private Scene m_scene;

-        private bool m_tainted = false;

-

-        #region ICommandableModule Members

-

-        public ICommander CommandInterface

-        {

-            get { return m_commander; }

-        }

-

-        #endregion

-

-        #region IRegionModule Members

-

-        /// <summary>

-        /// Creates and initialises a terrain module for a region

-        /// </summary>

-        /// <param name="scene">Region initialising</param>

-        /// <param name="config">Config for the region</param>

-        public void Initialise(Scene scene, IConfigSource config)

-        {

-            m_scene = scene;

-

-            // Install terrain module in the simulator

-            if (m_scene.Heightmap == null)

-            {

-                lock (m_scene)

-                {

-                    m_channel = new TerrainChannel();

-                    m_scene.Heightmap = m_channel;

-                    m_revert = new TerrainChannel();

-                    UpdateRevertMap();

-                }

-            }

-            else

-            {

-                m_channel = m_scene.Heightmap;

-                m_revert = new TerrainChannel();

-                UpdateRevertMap();

-            }

-

-            m_scene.RegisterModuleInterface<ITerrainModule>(this);

-            m_scene.EventManager.OnNewClient += EventManager_OnNewClient;

-            m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;

-            m_scene.EventManager.OnTerrainTick += EventManager_OnTerrainTick;

-        }

-

-        /// <summary>

-        /// Enables terrain module when called

-        /// </summary>

-        public void PostInitialise()

-        {

-            InstallDefaultEffects();

-            InstallInterfaces();

-            LoadPlugins();

-        }

-

-        public void Close()

-        {

-        }

-

-        public string Name

-        {

-            get { return "TerrainModule"; }

-        }

-

-        public bool IsSharedModule

-        {

-            get { return false; }

-        }

-

-        #endregion

-

-        #region ITerrainModule Members

-

-        /// <summary>

-        /// Loads a terrain file from disk and installs it in the scene.

-        /// </summary>

-        /// <param name="filename">Filename to terrain file. Type is determined by extension.</param>

-        public void LoadFromFile(string filename)

-        {

-            foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)

-            {

-                if (filename.EndsWith(loader.Key))

-                {

-                    lock (m_scene)

-                    {

-                        try

-                        {

-                            ITerrainChannel channel = loader.Value.LoadFile(filename);

-                            m_scene.Heightmap = channel;

-                            m_channel = channel;

-                            UpdateRevertMap();

-                        }

-                        catch (NotImplementedException)

-                        {

-                            m_log.Error("[TERRAIN]: Unable to load heightmap, the " + loader.Value +

-                                        " parser does not support file loading. (May be save only)");

-                            throw new TerrainException(String.Format("unable to load heightmap: parser {0} does not support loading", loader.Value));

-                        }

-                        catch (FileNotFoundException)

-                        {

-                            m_log.Error(

-                                "[TERRAIN]: Unable to load heightmap, file not found. (A directory permissions error may also cause this)");

-                            throw new TerrainException(

-                                String.Format("unable to load heightmap: file {0} not found (or permissions do not allow access", filename));

-                        }

-                    }

-                    CheckForTerrainUpdates();

-                    m_log.Info("[TERRAIN]: File (" + filename + ") loaded successfully");

-                    return;

-                }

-            }

-            m_log.Error("[TERRAIN]: Unable to load heightmap, no file loader availible for that format.");

-            throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename));

-        }

-

-        /// <summary>

-        /// Saves the current heightmap to a specified file.

-        /// </summary>

-        /// <param name="filename">The destination filename</param>

-        public void SaveToFile(string filename)

-        {

-            try

-            {

-                foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)

-                {

-                    if (filename.EndsWith(loader.Key))

-                    {

-                        loader.Value.SaveFile(filename, m_channel);

-                        return;

-                    }

-                }

-            }

-            catch (NotImplementedException)

-            {

-                m_log.Error("Unable to save to " + filename + ", saving of this file format has not been implemented.");

-                throw new TerrainException(String.Format("Unable to save heightmap: saving of this file format not implemented"));

-            }

-        }

-

-        #region Plugin Loading Methods

-

-        private void LoadPlugins()

-        {

-            m_plugineffects = new Dictionary<string, ITerrainEffect>();

-            // Load the files in the Terrain/ dir

-            string[] files = Directory.GetFiles("Terrain");

-            foreach (string file in files)

-            {

-                m_log.Info("Loading effects in " + file);

-                try

-                {

-                    Assembly library = Assembly.LoadFrom(file);

-                    foreach (Type pluginType in library.GetTypes())

-                    {

-                        try

-                        {

-                            if (pluginType.IsAbstract || pluginType.IsNotPublic)

-                                continue;

-

-                            if (pluginType.GetInterface("ITerrainEffect", false) != null)

-                            {

-                                ITerrainEffect terEffect = (ITerrainEffect) Activator.CreateInstance(library.GetType(pluginType.ToString()));

-                                if (!m_plugineffects.ContainsKey(pluginType.Name))

-                                {

-                                    m_plugineffects.Add(pluginType.Name, terEffect);

-                                    m_log.Info("E ... " + pluginType.Name);

-                                }

-                                else

-                                {

-                                    m_log.Warn("E ... " + pluginType.Name + " (Already added)");

-                                }

-                            }

-                            else if (pluginType.GetInterface("ITerrainLoader", false) != null)

-                            {

-                                ITerrainLoader terLoader = (ITerrainLoader) Activator.CreateInstance(library.GetType(pluginType.ToString()));

-                                m_loaders[terLoader.FileExtension] = terLoader;

-                                m_log.Info("L ... " + pluginType.Name);

-                            }

-                        }

-                        catch (AmbiguousMatchException)

-                        {

-                        }

-                    }

-                }

-                catch (BadImageFormatException)

-                {

-                }

-            }

-        }

-

-        #endregion

-

-        #endregion

-

-        /// <summary>

-        /// Installs into terrain module the standard suite of brushes

-        /// </summary>

-        private void InstallDefaultEffects()

-        {

-            // Draggable Paint Brush Effects

-            m_painteffects[StandardTerrainEffects.Raise] = new RaiseSphere();

-            m_painteffects[StandardTerrainEffects.Lower] = new LowerSphere();

-            m_painteffects[StandardTerrainEffects.Smooth] = new SmoothSphere();

-            m_painteffects[StandardTerrainEffects.Noise] = new NoiseSphere();

-            m_painteffects[StandardTerrainEffects.Flatten] = new FlattenSphere();

-            m_painteffects[StandardTerrainEffects.Revert] = new RevertSphere(m_revert);

-            m_painteffects[StandardTerrainEffects.Erode] = new ErodeSphere();

-            m_painteffects[StandardTerrainEffects.Weather] = new WeatherSphere();

-            m_painteffects[StandardTerrainEffects.Olsen] = new OlsenSphere();

-

-            // Area of effect selection effects

-            m_floodeffects[StandardTerrainEffects.Raise] = new RaiseArea();

-            m_floodeffects[StandardTerrainEffects.Lower] = new LowerArea();

-            m_floodeffects[StandardTerrainEffects.Smooth] = new SmoothArea();

-            m_floodeffects[StandardTerrainEffects.Noise] = new NoiseArea();

-            m_floodeffects[StandardTerrainEffects.Flatten] = new FlattenArea();

-            m_floodeffects[StandardTerrainEffects.Revert] = new RevertArea(m_revert);

-

-            // Filesystem load/save loaders

-            m_loaders[".r32"] = new RAW32();

-            m_loaders[".f32"] = m_loaders[".r32"];

-            m_loaders[".ter"] = new Terragen();

-            m_loaders[".raw"] = new LLRAW();

-            m_loaders[".jpg"] = new JPEG();

-            m_loaders[".jpeg"] = m_loaders[".jpg"];

-            m_loaders[".bmp"] = new BMP();

-            m_loaders[".png"] = new PNG();

-            m_loaders[".gif"] = new GIF();

-            m_loaders[".tif"] = new TIFF();

-            m_loaders[".tiff"] = m_loaders[".tif"];

-        }

-

-        /// <summary>

-        /// Saves the current state of the region into the revert map buffer.

-        /// </summary>

-        public void UpdateRevertMap()

-        {

-            int x;

-            for (x = 0; x < m_channel.Width; x++)

-            {

-                int y;

-                for (y = 0; y < m_channel.Height; y++)

-                {

-                    m_revert[x, y] = m_channel[x, y];

-                }

-            }

-        }

-

-        /// <summary>

-        /// Loads a tile from a larger terrain file and installs it into the region.

-        /// </summary>

-        /// <param name="filename">The terrain file to load</param>

-        /// <param name="fileWidth">The width of the file in units</param>

-        /// <param name="fileHeight">The height of the file in units</param>

-        /// <param name="fileStartX">Where to begin our slice</param>

-        /// <param name="fileStartY">Where to begin our slice</param>

-        public void LoadFromFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY)

-        {

-            int offsetX = (int) m_scene.RegionInfo.RegionLocX - fileStartX;

-            int offsetY = (int) m_scene.RegionInfo.RegionLocY - fileStartY;

-

-            if (offsetX >= 0 && offsetX < fileWidth && offsetY >= 0 && offsetY < fileHeight)

-            {

-                // this region is included in the tile request

-                foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)

-                {

-                    if (filename.EndsWith(loader.Key))

-                    {

-                        lock (m_scene)

-                        {

-                            ITerrainChannel channel = loader.Value.LoadFile(filename, offsetX, offsetY,

-                                                                            fileWidth, fileHeight,

-                                                                            (int) Constants.RegionSize,

-                                                                            (int) Constants.RegionSize);

-                            m_scene.Heightmap = channel;

-                            m_channel = channel;

-                            UpdateRevertMap();

-                        }

-                        return;

-                    }

-                }

-            }

-        }

-

-        /// <summary>

-        /// Performs updates to the region periodically, synchronising physics and other heightmap aware sections

-        /// </summary>

-        private void EventManager_OnTerrainTick()

-        {

-            if (m_tainted)

-            {

-                m_tainted = false;

-                m_scene.PhysicsScene.SetTerrain(m_channel.GetFloatsSerialised());

-                m_scene.SaveTerrain();

-                m_scene.CreateTerrainTexture(true);

-            }

-        }

-

-        /// <summary>

-        /// Processes commandline input. Do not call directly.

-        /// </summary>

-        /// <param name="args">Commandline arguments</param>

-        private void EventManager_OnPluginConsole(string[] args)

-        {

-            if (args[0] == "terrain")

-            {

-                string[] tmpArgs = new string[args.Length - 2];

-                int i;

-                for (i = 2; i < args.Length; i++)

-                    tmpArgs[i - 2] = args[i];

-

-                m_commander.ProcessConsoleCommand(args[1], tmpArgs);

-            }

-        }

-

-        /// <summary>

-        /// Installs terrain brush hook to IClientAPI

-        /// </summary>

-        /// <param name="client"></param>

-        private void EventManager_OnNewClient(IClientAPI client)

-        {

-            client.OnModifyTerrain += client_OnModifyTerrain;

-        }

-

-        /// <summary>

-        /// Checks to see if the terrain has been modified since last check

-        /// </summary>

-        private void CheckForTerrainUpdates()

-        {

-            bool shouldTaint = false;

-            float[] serialised = m_channel.GetFloatsSerialised();

-            int x;

-            for (x = 0; x < m_channel.Width; x += Constants.TerrainPatchSize)

-            {

-                int y;

-                for (y = 0; y < m_channel.Height; y += Constants.TerrainPatchSize)

-                {

-                    if (m_channel.Tainted(x, y))

-                    {

-                        SendToClients(serialised, x, y);

-                        shouldTaint = true;

-                    }

-                }

-            }

-            if (shouldTaint)

-            {

-                m_tainted = true;

-            }

-        }

-

-        /// <summary>

-        /// Sends a copy of the current terrain to the scenes clients

-        /// </summary>

-        /// <param name="serialised">A copy of the terrain as a 1D float array of size w*h</param>

-        /// <param name="x">The patch corner to send</param>

-        /// <param name="y">The patch corner to send</param>

-        private void SendToClients(float[] serialised, int x, int y)

-        {

-            m_scene.ForEachClient(

-                delegate(IClientAPI controller) { controller.SendLayerData(x / Constants.TerrainPatchSize, y / Constants.TerrainPatchSize, serialised); });

-        }

-

-        private void client_OnModifyTerrain(float height, float seconds, byte size, byte action, float north, float west,

-                                            float south, float east, IClientAPI remoteClient)

-        {

-            // Not a good permissions check, if in area mode, need to check the entire area.

-            if (m_scene.PermissionsMngr.CanTerraform(remoteClient.AgentId, new LLVector3(north, west, 0)))

-            {

-                if (north == south && east == west)

-                {

-                    if (m_painteffects.ContainsKey((StandardTerrainEffects) action))

-                    {

-                        m_painteffects[(StandardTerrainEffects) action].PaintEffect(

-                            m_channel, west, south, size, seconds);

-

-                        CheckForTerrainUpdates();

-                    }

-                    else

-                    {

-                        m_log.Debug("Unknown terrain brush type " + action);

-                    }

-                }

-                else

-                {

-                    if (m_floodeffects.ContainsKey((StandardTerrainEffects) action))

-                    {

-                        bool[,] fillArea = new bool[m_channel.Width,m_channel.Height];

-                        fillArea.Initialize();

-

-                        int x;

-                        for (x = 0; x < m_channel.Width; x++)

-                        {

-                            int y;

-                            for (y = 0; y < m_channel.Height; y++)

-                            {

-                                if (x < east && x > west)

-                                {

-                                    if (y < north && y > south)

-                                    {

-                                        fillArea[x, y] = true;

-                                    }

-                                }

-                            }

-                        }

-

-                        m_floodeffects[(StandardTerrainEffects) action].FloodEffect(

-                            m_channel, fillArea, size);

-

-                        CheckForTerrainUpdates();

-                    }

-                    else

-                    {

-                        m_log.Debug("Unknown terrain flood type " + action);

-                    }

-                }

-            }

-        }

-

-        #region Console Commands

-

-        private void InterfaceLoadFile(Object[] args)

-        {

-            LoadFromFile((string) args[0]);

-            CheckForTerrainUpdates();

-        }

-

-        private void InterfaceLoadTileFile(Object[] args)

-        {

-            LoadFromFile((string) args[0],

-                         (int) args[1],

-                         (int) args[2],

-                         (int) args[3],

-                         (int) args[4]);

-            CheckForTerrainUpdates();

-        }

-

-        private void InterfaceSaveFile(Object[] args)

-        {

-            SaveToFile((string) args[0]);

-        }

-

-        private void InterfaceBakeTerrain(Object[] args)

-        {

-            UpdateRevertMap();

-        }

-

-        private void InterfaceRevertTerrain(Object[] args)

-        {

-            int x, y;

-            for (x = 0; x < m_channel.Width; x++)

-                for (y = 0; y < m_channel.Height; y++)

-                    m_channel[x, y] = m_revert[x, y];

-

-            CheckForTerrainUpdates();

-        }

-

-        private void InterfaceElevateTerrain(Object[] args)

-        {

-            int x, y;

-            for (x = 0; x < m_channel.Width; x++)

-                for (y = 0; y < m_channel.Height; y++)

-                    m_channel[x, y] += (double) args[0];

-            CheckForTerrainUpdates();

-        }

-

-        private void InterfaceMultiplyTerrain(Object[] args)

-        {

-            int x, y;

-            for (x = 0; x < m_channel.Width; x++)

-                for (y = 0; y < m_channel.Height; y++)

-                    m_channel[x, y] *= (double) args[0];

-            CheckForTerrainUpdates();

-        }

-

-        private void InterfaceLowerTerrain(Object[] args)

-        {

-            int x, y;

-            for (x = 0; x < m_channel.Width; x++)

-                for (y = 0; y < m_channel.Height; y++)

-                    m_channel[x, y] -= (double) args[0];

-            CheckForTerrainUpdates();

-        }

-

-        private void InterfaceFillTerrain(Object[] args)

-        {

-            int x, y;

-

-            for (x = 0; x < m_channel.Width; x++)

-                for (y = 0; y < m_channel.Height; y++)

-                    m_channel[x, y] = (double) args[0];

-            CheckForTerrainUpdates();

-        }

-

-        private void InterfaceShowDebugStats(Object[] args)

-        {

-            double max = Double.MinValue;

-            double min = double.MaxValue;

-            double avg;

-            double sum = 0;

-

-            int x;

-            for (x = 0; x < m_channel.Width; x++)

-            {

-                int y;

-                for (y = 0; y < m_channel.Height; y++)

-                {

-                    sum += m_channel[x, y];

-                    if (max < m_channel[x, y])

-                        max = m_channel[x, y];

-                    if (min > m_channel[x, y])

-                        min = m_channel[x, y];

-                }

-            }

-

-            avg = sum / (m_channel.Height * m_channel.Width);

-

-            m_log.Info("Channel " + m_channel.Width + "x" + m_channel.Height);

-            m_log.Info("max/min/avg/sum: " + max + "/" + min + "/" + avg + "/" + sum);

-        }

-

-        private void InterfaceEnableExperimentalBrushes(Object[] args)

-        {

-            if ((bool) args[0])

-            {

-                m_painteffects[StandardTerrainEffects.Revert] = new WeatherSphere();

-                m_painteffects[StandardTerrainEffects.Flatten] = new OlsenSphere();

-                m_painteffects[StandardTerrainEffects.Smooth] = new ErodeSphere();

-            }

-            else

-            {

-                InstallDefaultEffects();

-            }

-        }

-

-        private void InterfaceRunPluginEffect(Object[] args)

-        {

-            if ((string) args[0] == "list")

-            {

-                m_log.Info("List of loaded plugins");

-                foreach (KeyValuePair<string, ITerrainEffect> kvp in m_plugineffects)

-                {

-                    m_log.Info(kvp.Key);

-                }

-                return;

-            }

-            if ((string) args[0] == "reload")

-            {

-                LoadPlugins();

-                return;

-            }

-            if (m_plugineffects.ContainsKey((string) args[0]))

-            {

-                m_plugineffects[(string) args[0]].RunEffect(m_channel);

-                CheckForTerrainUpdates();

-            }

-            else

-            {

-                m_log.Warn("No such plugin effect loaded.");

-            }

-        }

-

-        private void InstallInterfaces()

-        {

-            // Load / Save

-            string supportedFileExtensions = "";

-            foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)

-                supportedFileExtensions += " " + loader.Key + " (" + loader.Value + ")";

-

-            Command loadFromFileCommand =

-                new Command("load", InterfaceLoadFile, "Loads a terrain from a specified file.");

-            loadFromFileCommand.AddArgument("filename",

-                                            "The file you wish to load from, the file extension determines the loader to be used. Supported extensions include: " +

-                                            supportedFileExtensions, "String");

-

-            Command saveToFileCommand =

-                new Command("save", InterfaceSaveFile, "Saves the current heightmap to a specified file.");

-            saveToFileCommand.AddArgument("filename",

-                                          "The destination filename for your heightmap, the file extension determines the format to save in. Supported extensions include: " +

-                                          supportedFileExtensions, "String");

-

-            Command loadFromTileCommand =

-                new Command("load-tile", InterfaceLoadTileFile, "Loads a terrain from a section of a larger file.");

-            loadFromTileCommand.AddArgument("filename",

-                                            "The file you wish to load from, the file extension determines the loader to be used. Supported extensions include: " +

-                                            supportedFileExtensions, "String");

-            loadFromTileCommand.AddArgument("file width", "The width of the file in tiles", "Integer");

-            loadFromTileCommand.AddArgument("file height", "The height of the file in tiles", "Integer");

-            loadFromTileCommand.AddArgument("minimum X tile", "The X region coordinate of the first section on the file",

-                                            "Integer");

-            loadFromTileCommand.AddArgument("minimum Y tile", "The Y region coordinate of the first section on the file",

-                                            "Integer");

-

-            // Terrain adjustments

-            Command fillRegionCommand =

-                new Command("fill", InterfaceFillTerrain, "Fills the current heightmap with a specified value.");

-            fillRegionCommand.AddArgument("value", "The numeric value of the height you wish to set your region to.",

-                                          "Double");

-

-            Command elevateCommand =

-                new Command("elevate", InterfaceElevateTerrain, "Raises the current heightmap by the specified amount.");

-            elevateCommand.AddArgument("amount", "The amount of height to add to the terrain in meters.", "Double");

-

-            Command lowerCommand =

-                new Command("lower", InterfaceLowerTerrain, "Lowers the current heightmap by the specified amount.");

-            lowerCommand.AddArgument("amount", "The amount of height to remove from the terrain in meters.", "Double");

-

-            Command multiplyCommand =

-                new Command("multiply", InterfaceMultiplyTerrain, "Multiplies the heightmap by the value specified.");

-            multiplyCommand.AddArgument("value", "The value to multiply the heightmap by.", "Double");

-

-            Command bakeRegionCommand =

-                new Command("bake", InterfaceBakeTerrain, "Saves the current terrain into the regions revert map.");

-            Command revertRegionCommand =

-                new Command("revert", InterfaceRevertTerrain, "Loads the revert map terrain into the regions heightmap.");

-

-            // Debug

-            Command showDebugStatsCommand =

-                new Command("stats", InterfaceShowDebugStats,

-                            "Shows some information about the regions heightmap for debugging purposes.");

-

-            Command experimentalBrushesCommand =

-                new Command("newbrushes", InterfaceEnableExperimentalBrushes,

-                            "Enables experimental brushes which replace the standard terrain brushes. WARNING: This is a debug setting and may be removed at any time.");

-            experimentalBrushesCommand.AddArgument("Enabled?", "true / false - Enable new brushes", "Boolean");

-

-            //Plugins

-            Command pluginRunCommand =

-                new Command("effect", InterfaceRunPluginEffect, "Runs a specified plugin effect");

-            pluginRunCommand.AddArgument("name", "The plugin effect you wish to run, or 'list' to see all plugins", "String");

-

-            m_commander.RegisterCommand("load", loadFromFileCommand);

-            m_commander.RegisterCommand("load-tile", loadFromTileCommand);

-            m_commander.RegisterCommand("save", saveToFileCommand);

-            m_commander.RegisterCommand("fill", fillRegionCommand);

-            m_commander.RegisterCommand("elevate", elevateCommand);

-            m_commander.RegisterCommand("lower", lowerCommand);

-            m_commander.RegisterCommand("multiply", multiplyCommand);

-            m_commander.RegisterCommand("bake", bakeRegionCommand);

-            m_commander.RegisterCommand("revert", revertRegionCommand);

-            m_commander.RegisterCommand("newbrushes", experimentalBrushesCommand);

-            m_commander.RegisterCommand("stats", showDebugStatsCommand);

-            m_commander.RegisterCommand("effect", pluginRunCommand);

-

-            // Add this to our scene so scripts can call these functions

-            m_scene.RegisterModuleCommander("Terrain", m_commander);

-        }

-

-        #endregion

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using libsecondlife;
+using log4net;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Modules.Framework;
+using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;
+using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes;
+using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
+using OpenSim.Region.Environment.Scenes;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain
+{
+    public class TerrainModule : IRegionModule, ICommandableModule, ITerrainModule
+    {
+        #region StandardTerrainEffects enum
+
+        /// <summary>
+        /// A standard set of terrain brushes and effects recognised by viewers
+        /// </summary>
+        public enum StandardTerrainEffects : byte
+        {
+            Flatten = 0,
+            Raise = 1,
+            Lower = 2,
+            Smooth = 3,
+            Noise = 4,
+            Revert = 5,
+
+            // Extended brushes
+            Erode = 255,
+            Weather = 254,
+            Olsen = 253
+        }
+
+        #endregion
+
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private readonly Commander m_commander = new Commander("Terrain");
+
+        private readonly Dictionary<StandardTerrainEffects, ITerrainFloodEffect> m_floodeffects =
+            new Dictionary<StandardTerrainEffects, ITerrainFloodEffect>();
+
+        private readonly Dictionary<string, ITerrainLoader> m_loaders = new Dictionary<string, ITerrainLoader>();
+
+        private readonly Dictionary<StandardTerrainEffects, ITerrainPaintableEffect> m_painteffects =
+            new Dictionary<StandardTerrainEffects, ITerrainPaintableEffect>();
+
+        private ITerrainChannel m_channel;
+        private Dictionary<Location, ITerrainChannel> m_channels;
+        private Dictionary<string, ITerrainEffect> m_plugineffects;
+        private ITerrainChannel m_revert;
+        private Scene m_scene;
+        private bool m_tainted = false;
+
+        #region ICommandableModule Members
+
+        public ICommander CommandInterface
+        {
+            get { return m_commander; }
+        }
+
+        #endregion
+
+        #region IRegionModule Members
+
+        /// <summary>
+        /// Creates and initialises a terrain module for a region
+        /// </summary>
+        /// <param name="scene">Region initialising</param>
+        /// <param name="config">Config for the region</param>
+        public void Initialise(Scene scene, IConfigSource config)
+        {
+            m_scene = scene;
+
+            // Install terrain module in the simulator
+            if (m_scene.Heightmap == null)
+            {
+                lock (m_scene)
+                {
+                    m_channel = new TerrainChannel();
+                    m_scene.Heightmap = m_channel;
+                    m_revert = new TerrainChannel();
+                    UpdateRevertMap();
+                }
+            }
+            else
+            {
+                m_channel = m_scene.Heightmap;
+                m_revert = new TerrainChannel();
+                UpdateRevertMap();
+            }
+
+            m_scene.RegisterModuleInterface<ITerrainModule>(this);
+            m_scene.EventManager.OnNewClient += EventManager_OnNewClient;
+            m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
+            m_scene.EventManager.OnTerrainTick += EventManager_OnTerrainTick;
+        }
+
+        /// <summary>
+        /// Enables terrain module when called
+        /// </summary>
+        public void PostInitialise()
+        {
+            InstallDefaultEffects();
+            InstallInterfaces();
+            LoadPlugins();
+        }
+
+        public void Close()
+        {
+        }
+
+        public string Name
+        {
+            get { return "TerrainModule"; }
+        }
+
+        public bool IsSharedModule
+        {
+            get { return false; }
+        }
+
+        #endregion
+
+        #region ITerrainModule Members
+
+        /// <summary>
+        /// Loads a terrain file from disk and installs it in the scene.
+        /// </summary>
+        /// <param name="filename">Filename to terrain file. Type is determined by extension.</param>
+        public void LoadFromFile(string filename)
+        {
+            foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
+            {
+                if (filename.EndsWith(loader.Key))
+                {
+                    lock (m_scene)
+                    {
+                        try
+                        {
+                            ITerrainChannel channel = loader.Value.LoadFile(filename);
+                            m_scene.Heightmap = channel;
+                            m_channel = channel;
+                            UpdateRevertMap();
+                        }
+                        catch (NotImplementedException)
+                        {
+                            m_log.Error("[TERRAIN]: Unable to load heightmap, the " + loader.Value +
+                                        " parser does not support file loading. (May be save only)");
+                            throw new TerrainException(String.Format("unable to load heightmap: parser {0} does not support loading", loader.Value));
+                        }
+                        catch (FileNotFoundException)
+                        {
+                            m_log.Error(
+                                "[TERRAIN]: Unable to load heightmap, file not found. (A directory permissions error may also cause this)");
+                            throw new TerrainException(
+                                String.Format("unable to load heightmap: file {0} not found (or permissions do not allow access", filename));
+                        }
+                    }
+                    CheckForTerrainUpdates();
+                    m_log.Info("[TERRAIN]: File (" + filename + ") loaded successfully");
+                    return;
+                }
+            }
+            m_log.Error("[TERRAIN]: Unable to load heightmap, no file loader availible for that format.");
+            throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename));
+        }
+
+        /// <summary>
+        /// Saves the current heightmap to a specified file.
+        /// </summary>
+        /// <param name="filename">The destination filename</param>
+        public void SaveToFile(string filename)
+        {
+            try
+            {
+                foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
+                {
+                    if (filename.EndsWith(loader.Key))
+                    {
+                        loader.Value.SaveFile(filename, m_channel);
+                        return;
+                    }
+                }
+            }
+            catch (NotImplementedException)
+            {
+                m_log.Error("Unable to save to " + filename + ", saving of this file format has not been implemented.");
+                throw new TerrainException(String.Format("Unable to save heightmap: saving of this file format not implemented"));
+            }
+        }
+
+        #region Plugin Loading Methods
+
+        private void LoadPlugins()
+        {
+            m_plugineffects = new Dictionary<string, ITerrainEffect>();
+            // Load the files in the Terrain/ dir
+            string[] files = Directory.GetFiles("Terrain");
+            foreach (string file in files)
+            {
+                m_log.Info("Loading effects in " + file);
+                try
+                {
+                    Assembly library = Assembly.LoadFrom(file);
+                    foreach (Type pluginType in library.GetTypes())
+                    {
+                        try
+                        {
+                            if (pluginType.IsAbstract || pluginType.IsNotPublic)
+                                continue;
+
+                            if (pluginType.GetInterface("ITerrainEffect", false) != null)
+                            {
+                                ITerrainEffect terEffect = (ITerrainEffect) Activator.CreateInstance(library.GetType(pluginType.ToString()));
+                                if (!m_plugineffects.ContainsKey(pluginType.Name))
+                                {
+                                    m_plugineffects.Add(pluginType.Name, terEffect);
+                                    m_log.Info("E ... " + pluginType.Name);
+                                }
+                                else
+                                {
+                                    m_log.Warn("E ... " + pluginType.Name + " (Already added)");
+                                }
+                            }
+                            else if (pluginType.GetInterface("ITerrainLoader", false) != null)
+                            {
+                                ITerrainLoader terLoader = (ITerrainLoader) Activator.CreateInstance(library.GetType(pluginType.ToString()));
+                                m_loaders[terLoader.FileExtension] = terLoader;
+                                m_log.Info("L ... " + pluginType.Name);
+                            }
+                        }
+                        catch (AmbiguousMatchException)
+                        {
+                        }
+                    }
+                }
+                catch (BadImageFormatException)
+                {
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        /// <summary>
+        /// Installs into terrain module the standard suite of brushes
+        /// </summary>
+        private void InstallDefaultEffects()
+        {
+            // Draggable Paint Brush Effects
+            m_painteffects[StandardTerrainEffects.Raise] = new RaiseSphere();
+            m_painteffects[StandardTerrainEffects.Lower] = new LowerSphere();
+            m_painteffects[StandardTerrainEffects.Smooth] = new SmoothSphere();
+            m_painteffects[StandardTerrainEffects.Noise] = new NoiseSphere();
+            m_painteffects[StandardTerrainEffects.Flatten] = new FlattenSphere();
+            m_painteffects[StandardTerrainEffects.Revert] = new RevertSphere(m_revert);
+            m_painteffects[StandardTerrainEffects.Erode] = new ErodeSphere();
+            m_painteffects[StandardTerrainEffects.Weather] = new WeatherSphere();
+            m_painteffects[StandardTerrainEffects.Olsen] = new OlsenSphere();
+
+            // Area of effect selection effects
+            m_floodeffects[StandardTerrainEffects.Raise] = new RaiseArea();
+            m_floodeffects[StandardTerrainEffects.Lower] = new LowerArea();
+            m_floodeffects[StandardTerrainEffects.Smooth] = new SmoothArea();
+            m_floodeffects[StandardTerrainEffects.Noise] = new NoiseArea();
+            m_floodeffects[StandardTerrainEffects.Flatten] = new FlattenArea();
+            m_floodeffects[StandardTerrainEffects.Revert] = new RevertArea(m_revert);
+
+            // Filesystem load/save loaders
+            m_loaders[".r32"] = new RAW32();
+            m_loaders[".f32"] = m_loaders[".r32"];
+            m_loaders[".ter"] = new Terragen();
+            m_loaders[".raw"] = new LLRAW();
+            m_loaders[".jpg"] = new JPEG();
+            m_loaders[".jpeg"] = m_loaders[".jpg"];
+            m_loaders[".bmp"] = new BMP();
+            m_loaders[".png"] = new PNG();
+            m_loaders[".gif"] = new GIF();
+            m_loaders[".tif"] = new TIFF();
+            m_loaders[".tiff"] = m_loaders[".tif"];
+        }
+
+        /// <summary>
+        /// Saves the current state of the region into the revert map buffer.
+        /// </summary>
+        public void UpdateRevertMap()
+        {
+            int x;
+            for (x = 0; x < m_channel.Width; x++)
+            {
+                int y;
+                for (y = 0; y < m_channel.Height; y++)
+                {
+                    m_revert[x, y] = m_channel[x, y];
+                }
+            }
+        }
+
+        /// <summary>
+        /// Loads a tile from a larger terrain file and installs it into the region.
+        /// </summary>
+        /// <param name="filename">The terrain file to load</param>
+        /// <param name="fileWidth">The width of the file in units</param>
+        /// <param name="fileHeight">The height of the file in units</param>
+        /// <param name="fileStartX">Where to begin our slice</param>
+        /// <param name="fileStartY">Where to begin our slice</param>
+        public void LoadFromFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY)
+        {
+            int offsetX = (int) m_scene.RegionInfo.RegionLocX - fileStartX;
+            int offsetY = (int) m_scene.RegionInfo.RegionLocY - fileStartY;
+
+            if (offsetX >= 0 && offsetX < fileWidth && offsetY >= 0 && offsetY < fileHeight)
+            {
+                // this region is included in the tile request
+                foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
+                {
+                    if (filename.EndsWith(loader.Key))
+                    {
+                        lock (m_scene)
+                        {
+                            ITerrainChannel channel = loader.Value.LoadFile(filename, offsetX, offsetY,
+                                                                            fileWidth, fileHeight,
+                                                                            (int) Constants.RegionSize,
+                                                                            (int) Constants.RegionSize);
+                            m_scene.Heightmap = channel;
+                            m_channel = channel;
+                            UpdateRevertMap();
+                        }
+                        return;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Performs updates to the region periodically, synchronising physics and other heightmap aware sections
+        /// </summary>
+        private void EventManager_OnTerrainTick()
+        {
+            if (m_tainted)
+            {
+                m_tainted = false;
+                m_scene.PhysicsScene.SetTerrain(m_channel.GetFloatsSerialised());
+                m_scene.SaveTerrain();
+                m_scene.CreateTerrainTexture(true);
+            }
+        }
+
+        /// <summary>
+        /// Processes commandline input. Do not call directly.
+        /// </summary>
+        /// <param name="args">Commandline arguments</param>
+        private void EventManager_OnPluginConsole(string[] args)
+        {
+            if (args[0] == "terrain")
+            {
+                string[] tmpArgs = new string[args.Length - 2];
+                int i;
+                for (i = 2; i < args.Length; i++)
+                    tmpArgs[i - 2] = args[i];
+
+                m_commander.ProcessConsoleCommand(args[1], tmpArgs);
+            }
+        }
+
+        /// <summary>
+        /// Installs terrain brush hook to IClientAPI
+        /// </summary>
+        /// <param name="client"></param>
+        private void EventManager_OnNewClient(IClientAPI client)
+        {
+            client.OnModifyTerrain += client_OnModifyTerrain;
+        }
+
+        /// <summary>
+        /// Checks to see if the terrain has been modified since last check
+        /// </summary>
+        private void CheckForTerrainUpdates()
+        {
+            bool shouldTaint = false;
+            float[] serialised = m_channel.GetFloatsSerialised();
+            int x;
+            for (x = 0; x < m_channel.Width; x += Constants.TerrainPatchSize)
+            {
+                int y;
+                for (y = 0; y < m_channel.Height; y += Constants.TerrainPatchSize)
+                {
+                    if (m_channel.Tainted(x, y))
+                    {
+                        SendToClients(serialised, x, y);
+                        shouldTaint = true;
+                    }
+                }
+            }
+            if (shouldTaint)
+            {
+                m_tainted = true;
+            }
+        }
+
+        /// <summary>
+        /// Sends a copy of the current terrain to the scenes clients
+        /// </summary>
+        /// <param name="serialised">A copy of the terrain as a 1D float array of size w*h</param>
+        /// <param name="x">The patch corner to send</param>
+        /// <param name="y">The patch corner to send</param>
+        private void SendToClients(float[] serialised, int x, int y)
+        {
+            m_scene.ForEachClient(
+                delegate(IClientAPI controller) { controller.SendLayerData(x / Constants.TerrainPatchSize, y / Constants.TerrainPatchSize, serialised); });
+        }
+
+        private void client_OnModifyTerrain(float height, float seconds, byte size, byte action, float north, float west,
+                                            float south, float east, IClientAPI remoteClient)
+        {
+            // Not a good permissions check, if in area mode, need to check the entire area.
+            if (m_scene.PermissionsMngr.CanTerraform(remoteClient.AgentId, new LLVector3(north, west, 0)))
+            {
+                if (north == south && east == west)
+                {
+                    if (m_painteffects.ContainsKey((StandardTerrainEffects) action))
+                    {
+                        m_painteffects[(StandardTerrainEffects) action].PaintEffect(
+                            m_channel, west, south, size, seconds);
+
+                        CheckForTerrainUpdates();
+                    }
+                    else
+                    {
+                        m_log.Debug("Unknown terrain brush type " + action);
+                    }
+                }
+                else
+                {
+                    if (m_floodeffects.ContainsKey((StandardTerrainEffects) action))
+                    {
+                        bool[,] fillArea = new bool[m_channel.Width,m_channel.Height];
+                        fillArea.Initialize();
+
+                        int x;
+                        for (x = 0; x < m_channel.Width; x++)
+                        {
+                            int y;
+                            for (y = 0; y < m_channel.Height; y++)
+                            {
+                                if (x < east && x > west)
+                                {
+                                    if (y < north && y > south)
+                                    {
+                                        fillArea[x, y] = true;
+                                    }
+                                }
+                            }
+                        }
+
+                        m_floodeffects[(StandardTerrainEffects) action].FloodEffect(
+                            m_channel, fillArea, size);
+
+                        CheckForTerrainUpdates();
+                    }
+                    else
+                    {
+                        m_log.Debug("Unknown terrain flood type " + action);
+                    }
+                }
+            }
+        }
+
+        #region Console Commands
+
+        private void InterfaceLoadFile(Object[] args)
+        {
+            LoadFromFile((string) args[0]);
+            CheckForTerrainUpdates();
+        }
+
+        private void InterfaceLoadTileFile(Object[] args)
+        {
+            LoadFromFile((string) args[0],
+                         (int) args[1],
+                         (int) args[2],
+                         (int) args[3],
+                         (int) args[4]);
+            CheckForTerrainUpdates();
+        }
+
+        private void InterfaceSaveFile(Object[] args)
+        {
+            SaveToFile((string) args[0]);
+        }
+
+        private void InterfaceBakeTerrain(Object[] args)
+        {
+            UpdateRevertMap();
+        }
+
+        private void InterfaceRevertTerrain(Object[] args)
+        {
+            int x, y;
+            for (x = 0; x < m_channel.Width; x++)
+                for (y = 0; y < m_channel.Height; y++)
+                    m_channel[x, y] = m_revert[x, y];
+
+            CheckForTerrainUpdates();
+        }
+
+        private void InterfaceElevateTerrain(Object[] args)
+        {
+            int x, y;
+            for (x = 0; x < m_channel.Width; x++)
+                for (y = 0; y < m_channel.Height; y++)
+                    m_channel[x, y] += (double) args[0];
+            CheckForTerrainUpdates();
+        }
+
+        private void InterfaceMultiplyTerrain(Object[] args)
+        {
+            int x, y;
+            for (x = 0; x < m_channel.Width; x++)
+                for (y = 0; y < m_channel.Height; y++)
+                    m_channel[x, y] *= (double) args[0];
+            CheckForTerrainUpdates();
+        }
+
+        private void InterfaceLowerTerrain(Object[] args)
+        {
+            int x, y;
+            for (x = 0; x < m_channel.Width; x++)
+                for (y = 0; y < m_channel.Height; y++)
+                    m_channel[x, y] -= (double) args[0];
+            CheckForTerrainUpdates();
+        }
+
+        private void InterfaceFillTerrain(Object[] args)
+        {
+            int x, y;
+
+            for (x = 0; x < m_channel.Width; x++)
+                for (y = 0; y < m_channel.Height; y++)
+                    m_channel[x, y] = (double) args[0];
+            CheckForTerrainUpdates();
+        }
+
+        private void InterfaceShowDebugStats(Object[] args)
+        {
+            double max = Double.MinValue;
+            double min = double.MaxValue;
+            double avg;
+            double sum = 0;
+
+            int x;
+            for (x = 0; x < m_channel.Width; x++)
+            {
+                int y;
+                for (y = 0; y < m_channel.Height; y++)
+                {
+                    sum += m_channel[x, y];
+                    if (max < m_channel[x, y])
+                        max = m_channel[x, y];
+                    if (min > m_channel[x, y])
+                        min = m_channel[x, y];
+                }
+            }
+
+            avg = sum / (m_channel.Height * m_channel.Width);
+
+            m_log.Info("Channel " + m_channel.Width + "x" + m_channel.Height);
+            m_log.Info("max/min/avg/sum: " + max + "/" + min + "/" + avg + "/" + sum);
+        }
+
+        private void InterfaceEnableExperimentalBrushes(Object[] args)
+        {
+            if ((bool) args[0])
+            {
+                m_painteffects[StandardTerrainEffects.Revert] = new WeatherSphere();
+                m_painteffects[StandardTerrainEffects.Flatten] = new OlsenSphere();
+                m_painteffects[StandardTerrainEffects.Smooth] = new ErodeSphere();
+            }
+            else
+            {
+                InstallDefaultEffects();
+            }
+        }
+
+        private void InterfaceRunPluginEffect(Object[] args)
+        {
+            if ((string) args[0] == "list")
+            {
+                m_log.Info("List of loaded plugins");
+                foreach (KeyValuePair<string, ITerrainEffect> kvp in m_plugineffects)
+                {
+                    m_log.Info(kvp.Key);
+                }
+                return;
+            }
+            if ((string) args[0] == "reload")
+            {
+                LoadPlugins();
+                return;
+            }
+            if (m_plugineffects.ContainsKey((string) args[0]))
+            {
+                m_plugineffects[(string) args[0]].RunEffect(m_channel);
+                CheckForTerrainUpdates();
+            }
+            else
+            {
+                m_log.Warn("No such plugin effect loaded.");
+            }
+        }
+
+        private void InstallInterfaces()
+        {
+            // Load / Save
+            string supportedFileExtensions = "";
+            foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
+                supportedFileExtensions += " " + loader.Key + " (" + loader.Value + ")";
+
+            Command loadFromFileCommand =
+                new Command("load", InterfaceLoadFile, "Loads a terrain from a specified file.");
+            loadFromFileCommand.AddArgument("filename",
+                                            "The file you wish to load from, the file extension determines the loader to be used. Supported extensions include: " +
+                                            supportedFileExtensions, "String");
+
+            Command saveToFileCommand =
+                new Command("save", InterfaceSaveFile, "Saves the current heightmap to a specified file.");
+            saveToFileCommand.AddArgument("filename",
+                                          "The destination filename for your heightmap, the file extension determines the format to save in. Supported extensions include: " +
+                                          supportedFileExtensions, "String");
+
+            Command loadFromTileCommand =
+                new Command("load-tile", InterfaceLoadTileFile, "Loads a terrain from a section of a larger file.");
+            loadFromTileCommand.AddArgument("filename",
+                                            "The file you wish to load from, the file extension determines the loader to be used. Supported extensions include: " +
+                                            supportedFileExtensions, "String");
+            loadFromTileCommand.AddArgument("file width", "The width of the file in tiles", "Integer");
+            loadFromTileCommand.AddArgument("file height", "The height of the file in tiles", "Integer");
+            loadFromTileCommand.AddArgument("minimum X tile", "The X region coordinate of the first section on the file",
+                                            "Integer");
+            loadFromTileCommand.AddArgument("minimum Y tile", "The Y region coordinate of the first section on the file",
+                                            "Integer");
+
+            // Terrain adjustments
+            Command fillRegionCommand =
+                new Command("fill", InterfaceFillTerrain, "Fills the current heightmap with a specified value.");
+            fillRegionCommand.AddArgument("value", "The numeric value of the height you wish to set your region to.",
+                                          "Double");
+
+            Command elevateCommand =
+                new Command("elevate", InterfaceElevateTerrain, "Raises the current heightmap by the specified amount.");
+            elevateCommand.AddArgument("amount", "The amount of height to add to the terrain in meters.", "Double");
+
+            Command lowerCommand =
+                new Command("lower", InterfaceLowerTerrain, "Lowers the current heightmap by the specified amount.");
+            lowerCommand.AddArgument("amount", "The amount of height to remove from the terrain in meters.", "Double");
+
+            Command multiplyCommand =
+                new Command("multiply", InterfaceMultiplyTerrain, "Multiplies the heightmap by the value specified.");
+            multiplyCommand.AddArgument("value", "The value to multiply the heightmap by.", "Double");
+
+            Command bakeRegionCommand =
+                new Command("bake", InterfaceBakeTerrain, "Saves the current terrain into the regions revert map.");
+            Command revertRegionCommand =
+                new Command("revert", InterfaceRevertTerrain, "Loads the revert map terrain into the regions heightmap.");
+
+            // Debug
+            Command showDebugStatsCommand =
+                new Command("stats", InterfaceShowDebugStats,
+                            "Shows some information about the regions heightmap for debugging purposes.");
+
+            Command experimentalBrushesCommand =
+                new Command("newbrushes", InterfaceEnableExperimentalBrushes,
+                            "Enables experimental brushes which replace the standard terrain brushes. WARNING: This is a debug setting and may be removed at any time.");
+            experimentalBrushesCommand.AddArgument("Enabled?", "true / false - Enable new brushes", "Boolean");
+
+            //Plugins
+            Command pluginRunCommand =
+                new Command("effect", InterfaceRunPluginEffect, "Runs a specified plugin effect");
+            pluginRunCommand.AddArgument("name", "The plugin effect you wish to run, or 'list' to see all plugins", "String");
+
+            m_commander.RegisterCommand("load", loadFromFileCommand);
+            m_commander.RegisterCommand("load-tile", loadFromTileCommand);
+            m_commander.RegisterCommand("save", saveToFileCommand);
+            m_commander.RegisterCommand("fill", fillRegionCommand);
+            m_commander.RegisterCommand("elevate", elevateCommand);
+            m_commander.RegisterCommand("lower", lowerCommand);
+            m_commander.RegisterCommand("multiply", multiplyCommand);
+            m_commander.RegisterCommand("bake", bakeRegionCommand);
+            m_commander.RegisterCommand("revert", revertRegionCommand);
+            m_commander.RegisterCommand("newbrushes", experimentalBrushesCommand);
+            m_commander.RegisterCommand("stats", showDebugStatsCommand);
+            m_commander.RegisterCommand("effect", pluginRunCommand);
+
+            // Add this to our scene so scripts can call these functions
+            m_scene.RegisterModuleCommander("Terrain", m_commander);
+        }
+
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
index b593717..daef6bd 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
@@ -1,133 +1,133 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using System;

-using OpenSim.Region.Environment.Interfaces;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain

-{

-    public static class TerrainUtil

-    {

-        public static double MetersToSphericalStrength(double size)

-        {

-            return Math.Pow(2, size);

-        }

-

-        public static double SphericalFactor(double x, double y, double rx, double ry, double size)

-        {

-            return size * size - ((x - rx) * (x - rx) + (y - ry) * (y - ry));

-        }

-

-        public static double GetBilinearInterpolate(double x, double y, ITerrainChannel map)

-        {

-            int w = map.Width;

-            int h = map.Height;

-

-            if (x > w - 2.0)

-                x = w - 2.0;

-            if (y > h - 2.0)

-                y = h - 2.0;

-            if (x < 0.0)

-                x = 0.0;

-            if (y < 0.0)

-                y = 0.0;

-

-            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];

-            double h11 = map[(int) x + stepSize, (int) y + stepSize];

-            double h1 = h00;

-            double h2 = h10;

-            double h3 = h01;

-            double h4 = h11;

-            double a00 = h1;

-            double a10 = h2 - h1;

-            double a01 = h3 - h1;

-            double a11 = h1 - h2 - h3 + h4;

-            double partialx = x - (int) x;

-            double partialz = y - (int) y;

-            double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz);

-            return hi;

-        }

-

-        private static double Noise(double x, double y)

-        {

-            int n = (int) x + (int) (y * 749);

-            n = (n << 13) ^ n;

-            return (1.0 - ((n * (n * n * 15731 + 789221) + 1376312589) & 0x7fffffff) / 1073741824.0);

-        }

-

-        private static double SmoothedNoise1(double x, double y)

-        {

-            double corners = (Noise(x - 1, y - 1) + Noise(x + 1, y - 1) + Noise(x - 1, y + 1) + Noise(x + 1, y + 1)) / 16;

-            double sides = (Noise(x - 1, y) + Noise(x + 1, y) + Noise(x, y - 1) + Noise(x, y + 1)) / 8;

-            double center = Noise(x, y) / 4;

-            return corners + sides + center;

-        }

-

-        private static double Interpolate(double x, double y, double z)

-        {

-            return (x * (1.0 - z)) + (y * z);

-        }

-

-        private static double InterpolatedNoise(double x, double y)

-        {

-            int integer_X = (int) (x);

-            double fractional_X = x - integer_X;

-

-            int integer_Y = (int) y;

-            double fractional_Y = y - integer_Y;

-

-            double v1 = SmoothedNoise1(integer_X, integer_Y);

-            double v2 = SmoothedNoise1(integer_X + 1, integer_Y);

-            double v3 = SmoothedNoise1(integer_X, integer_Y + 1);

-            double v4 = SmoothedNoise1(integer_X + 1, integer_Y + 1);

-

-            double i1 = Interpolate(v1, v2, fractional_X);

-            double i2 = Interpolate(v3, v4, fractional_X);

-

-            return Interpolate(i1, i2, fractional_Y);

-        }

-

-        public static double PerlinNoise2D(double x, double y, int octaves, double persistence)

-        {

-            double frequency = 0.0;

-            double amplitude = 0.0;

-            double total = 0.0;

-

-            for (int i = 0; i < octaves; i++)

-            {

-                frequency = Math.Pow(2, i);

-                amplitude = Math.Pow(persistence, i);

-

-                total += InterpolatedNoise(x * frequency, y * frequency) * amplitude;

-            }

-            return total;

-        }

-    }

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain
+{
+    public static class TerrainUtil
+    {
+        public static double MetersToSphericalStrength(double size)
+        {
+            return Math.Pow(2, size);
+        }
+
+        public static double SphericalFactor(double x, double y, double rx, double ry, double size)
+        {
+            return size * size - ((x - rx) * (x - rx) + (y - ry) * (y - ry));
+        }
+
+        public static double GetBilinearInterpolate(double x, double y, ITerrainChannel map)
+        {
+            int w = map.Width;
+            int h = map.Height;
+
+            if (x > w - 2.0)
+                x = w - 2.0;
+            if (y > h - 2.0)
+                y = h - 2.0;
+            if (x < 0.0)
+                x = 0.0;
+            if (y < 0.0)
+                y = 0.0;
+
+            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];
+            double h11 = map[(int) x + stepSize, (int) y + stepSize];
+            double h1 = h00;
+            double h2 = h10;
+            double h3 = h01;
+            double h4 = h11;
+            double a00 = h1;
+            double a10 = h2 - h1;
+            double a01 = h3 - h1;
+            double a11 = h1 - h2 - h3 + h4;
+            double partialx = x - (int) x;
+            double partialz = y - (int) y;
+            double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz);
+            return hi;
+        }
+
+        private static double Noise(double x, double y)
+        {
+            int n = (int) x + (int) (y * 749);
+            n = (n << 13) ^ n;
+            return (1.0 - ((n * (n * n * 15731 + 789221) + 1376312589) & 0x7fffffff) / 1073741824.0);
+        }
+
+        private static double SmoothedNoise1(double x, double y)
+        {
+            double corners = (Noise(x - 1, y - 1) + Noise(x + 1, y - 1) + Noise(x - 1, y + 1) + Noise(x + 1, y + 1)) / 16;
+            double sides = (Noise(x - 1, y) + Noise(x + 1, y) + Noise(x, y - 1) + Noise(x, y + 1)) / 8;
+            double center = Noise(x, y) / 4;
+            return corners + sides + center;
+        }
+
+        private static double Interpolate(double x, double y, double z)
+        {
+            return (x * (1.0 - z)) + (y * z);
+        }
+
+        private static double InterpolatedNoise(double x, double y)
+        {
+            int integer_X = (int) (x);
+            double fractional_X = x - integer_X;
+
+            int integer_Y = (int) y;
+            double fractional_Y = y - integer_Y;
+
+            double v1 = SmoothedNoise1(integer_X, integer_Y);
+            double v2 = SmoothedNoise1(integer_X + 1, integer_Y);
+            double v3 = SmoothedNoise1(integer_X, integer_Y + 1);
+            double v4 = SmoothedNoise1(integer_X + 1, integer_Y + 1);
+
+            double i1 = Interpolate(v1, v2, fractional_X);
+            double i2 = Interpolate(v3, v4, fractional_X);
+
+            return Interpolate(i1, i2, fractional_Y);
+        }
+
+        public static double PerlinNoise2D(double x, double y, int octaves, double persistence)
+        {
+            double frequency = 0.0;
+            double amplitude = 0.0;
+            double total = 0.0;
+
+            for (int i = 0; i < octaves; i++)
+            {
+                frequency = Math.Pow(2, i);
+                amplitude = Math.Pow(persistence, i);
+
+                total += InterpolatedNoise(x * frequency, y * frequency) * amplitude;
+            }
+            return total;
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs b/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs
index ccb0561..842e2ee 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs
@@ -1,59 +1,59 @@
-using System;

-using NUnit.Framework;

-using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;

-

-namespace OpenSim.Region.Environment.Modules.World.Terrain.Tests

-{

-    [TestFixture]

-    public class TerrainTest

-    {

-        [Test]

-        public void BrushTest()

-        {

-            TerrainChannel x = new TerrainChannel(256, 256);

-            ITerrainPaintableEffect effect = new RaiseSphere();

-

-            effect.PaintEffect(x, 128.0, 128.0, 50, 0.1);

-            Assert.That(x[128, 128] > 0.0, "Raise brush not raising values.");

-            Assert.That(x[0, 128] > 0.0, "Raise brush lowering edge values.");

-

-            x = new TerrainChannel(256, 256);

-            effect = new LowerSphere();

-

-            effect.PaintEffect(x, 128.0, 128.0, 50, 0.1);

-            Assert.That(x[128, 128] < 0.0, "Lower not lowering values.");

-            Assert.That(x[0, 128] < 0.0, "Lower brush affecting edge values.");

-        }

-

-        [Test]

-        public void TerrainChannelTest()

-        {

-            TerrainChannel x = new TerrainChannel(256, 256);

-            Assert.That(x[0, 0] == 0.0, "Terrain not initialising correctly.");

-

-            x[0, 0] = 1.0;

-            Assert.That(x[0, 0] == 1.0, "Terrain not setting values correctly.");

-

-            x[0, 0] = 0;

-            x[0, 0] += 5.0;

-            x[0, 0] -= 1.0;

-            Assert.That(x[0, 0] == 4.0, "Terrain addition/subtraction error.");

-

-            x[0, 0] = Math.PI;

-            double[,] doublesExport = x.GetDoubles();

-            Assert.That(doublesExport[0, 0] == Math.PI, "Export to double[,] array not working correctly.");

-

-            x[0, 0] = 1.0;

-            float[] floatsExport = x.GetFloatsSerialised();

-            Assert.That(floatsExport[0] == 1.0f, "Export to float[] not working correctly.");

-

-            x[0, 0] = 1.0;

-            Assert.That(x.Tainted(0, 0), "Terrain channel tainting not working correctly.");

-            Assert.That(!x.Tainted(0, 0), "Terrain channel tainting not working correctly.");

-

-            TerrainChannel y = x.Copy();

-            Assert.That(!ReferenceEquals(x, y), "Terrain copy not duplicating correctly.");

-            Assert.That(!ReferenceEquals(x.GetDoubles(), y.GetDoubles()), "Terrain array not duplicating correctly.");

-        }

-    }

+using System;
+using NUnit.Framework;
+using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
+
+namespace OpenSim.Region.Environment.Modules.World.Terrain.Tests
+{
+    [TestFixture]
+    public class TerrainTest
+    {
+        [Test]
+        public void BrushTest()
+        {
+            TerrainChannel x = new TerrainChannel(256, 256);
+            ITerrainPaintableEffect effect = new RaiseSphere();
+
+            effect.PaintEffect(x, 128.0, 128.0, 50, 0.1);
+            Assert.That(x[128, 128] > 0.0, "Raise brush not raising values.");
+            Assert.That(x[0, 128] > 0.0, "Raise brush lowering edge values.");
+
+            x = new TerrainChannel(256, 256);
+            effect = new LowerSphere();
+
+            effect.PaintEffect(x, 128.0, 128.0, 50, 0.1);
+            Assert.That(x[128, 128] < 0.0, "Lower not lowering values.");
+            Assert.That(x[0, 128] < 0.0, "Lower brush affecting edge values.");
+        }
+
+        [Test]
+        public void TerrainChannelTest()
+        {
+            TerrainChannel x = new TerrainChannel(256, 256);
+            Assert.That(x[0, 0] == 0.0, "Terrain not initialising correctly.");
+
+            x[0, 0] = 1.0;
+            Assert.That(x[0, 0] == 1.0, "Terrain not setting values correctly.");
+
+            x[0, 0] = 0;
+            x[0, 0] += 5.0;
+            x[0, 0] -= 1.0;
+            Assert.That(x[0, 0] == 4.0, "Terrain addition/subtraction error.");
+
+            x[0, 0] = Math.PI;
+            double[,] doublesExport = x.GetDoubles();
+            Assert.That(doublesExport[0, 0] == Math.PI, "Export to double[,] array not working correctly.");
+
+            x[0, 0] = 1.0;
+            float[] floatsExport = x.GetFloatsSerialised();
+            Assert.That(floatsExport[0] == 1.0f, "Export to float[] not working correctly.");
+
+            x[0, 0] = 1.0;
+            Assert.That(x.Tainted(0, 0), "Terrain channel tainting not working correctly.");
+            Assert.That(!x.Tainted(0, 0), "Terrain channel tainting not working correctly.");
+
+            TerrainChannel y = x.Copy();
+            Assert.That(!ReferenceEquals(x, y), "Terrain copy not duplicating correctly.");
+            Assert.That(!ReferenceEquals(x.GetDoubles(), y.GetDoubles()), "Terrain array not duplicating correctly.");
+        }
+    }
 }
\ No newline at end of file