47 files changed, 6986 insertions, 6986 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs b/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs
index efc5234..9ac3cc3 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs
@@ -1,1000 +1,1000 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using Axiom.Math;
+using Axiom.Math;
-using libsecondlife;
+using libsecondlife;
-using libsecondlife.Packets;
+using libsecondlife.Packets;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.Physics.Manager;
-namespace OpenSim.Region.Environment.Modules.World.Land
+namespace OpenSim.Region.Environment.Modules.World.Land
-{
+{
-    public class LandChannel : ILandChannel
+    public class LandChannel : ILandChannel
-    {
+    {
-        #region Constants
+        #region Constants
-        //Land types set with flags in ParcelOverlay.
+        //Land types set with flags in ParcelOverlay.
-        //Only one of these can be used. 
+        //Only one of these can be used. 
-        public const float BAN_LINE_SAFETY_HIEGHT = 100;
+        public const float BAN_LINE_SAFETY_HIEGHT = 100;
-        public const byte LAND_FLAG_PROPERTY_BORDER_SOUTH = (byte) 128; //Equals 10000000
+        public const byte LAND_FLAG_PROPERTY_BORDER_SOUTH = (byte) 128; //Equals 10000000
-        public const byte LAND_FLAG_PROPERTY_BORDER_WEST = (byte) 64; //Equals 01000000
+        public const byte LAND_FLAG_PROPERTY_BORDER_WEST = (byte) 64; //Equals 01000000
-        //RequestResults (I think these are right, they seem to work):
+        //RequestResults (I think these are right, they seem to work):
-        public const int LAND_RESULT_MULTIPLE = 1; // The request they made contained more than a single peice of land
+        public const int LAND_RESULT_MULTIPLE = 1; // The request they made contained more than a single peice of land
-        public const int LAND_RESULT_SINGLE = 0; // The request they made contained only a single piece of land
+        public const int LAND_RESULT_SINGLE = 0; // The request they made contained only a single piece of land
-        //ParcelSelectObjects
+        //ParcelSelectObjects
-        public const int LAND_SELECT_OBJECTS_GROUP = 4;
+        public const int LAND_SELECT_OBJECTS_GROUP = 4;
-        public const int LAND_SELECT_OBJECTS_OTHER = 8;
+        public const int LAND_SELECT_OBJECTS_OTHER = 8;
-        public const int LAND_SELECT_OBJECTS_OWNER = 2;
+        public const int LAND_SELECT_OBJECTS_OWNER = 2;
-        public const byte LAND_TYPE_IS_BEING_AUCTIONED = (byte) 5; //Equals 00000101
+        public const byte LAND_TYPE_IS_BEING_AUCTIONED = (byte) 5; //Equals 00000101
-        public const byte LAND_TYPE_IS_FOR_SALE = (byte) 4; //Equals 00000100
+        public const byte LAND_TYPE_IS_FOR_SALE = (byte) 4; //Equals 00000100
-        public const byte LAND_TYPE_OWNED_BY_GROUP = (byte) 2; //Equals 00000010
+        public const byte LAND_TYPE_OWNED_BY_GROUP = (byte) 2; //Equals 00000010
-        public const byte LAND_TYPE_OWNED_BY_OTHER = (byte) 1; //Equals 00000001
+        public const byte LAND_TYPE_OWNED_BY_OTHER = (byte) 1; //Equals 00000001
-        public const byte LAND_TYPE_OWNED_BY_REQUESTER = (byte) 3; //Equals 00000011
+        public const byte LAND_TYPE_OWNED_BY_REQUESTER = (byte) 3; //Equals 00000011
-        public const byte LAND_TYPE_PUBLIC = (byte) 0; //Equals 00000000
+        public const byte LAND_TYPE_PUBLIC = (byte) 0; //Equals 00000000
-        //These are other constants. Yay!
+        //These are other constants. Yay!
-        public const int START_LAND_LOCAL_ID = 1;
+        public const int START_LAND_LOCAL_ID = 1;
-        #endregion
+        #endregion
-        private int[,] landIDList = new int[64,64];
+        private int[,] landIDList = new int[64,64];
-        private Dictionary<int, ILandObject> landList = new Dictionary<int, ILandObject>();
+        private Dictionary<int, ILandObject> landList = new Dictionary<int, ILandObject>();
-        private bool landPrimCountTainted = false;
+        private bool landPrimCountTainted = false;
-        private int lastLandLocalID = START_LAND_LOCAL_ID - 1;
+        private int lastLandLocalID = START_LAND_LOCAL_ID - 1;
-        private bool m_allowedForcefulBans = true;
+        private bool m_allowedForcefulBans = true;
-        private Scene m_scene;
+        private Scene m_scene;
-        public LandChannel(Scene scene)
+        public LandChannel(Scene scene)
-        {
+        {
-            m_scene = scene;
+            m_scene = scene;
-            landIDList.Initialize();
+            landIDList.Initialize();
-        }
+        }
-        #region Land Object From Storage Functions
+        #region Land Object From Storage Functions
-        public void IncomingLandObjectsFromStorage(List<LandData> data)
+        public void IncomingLandObjectsFromStorage(List<LandData> data)
-        {
+        {
-            for (int i = 0; i < data.Count; i++)
+            for (int i = 0; i < data.Count; i++)
-            {
+            {
-                //try
+                //try
-                //{
+                //{
-                IncomingLandObjectFromStorage(data[i]);
+                IncomingLandObjectFromStorage(data[i]);
-                //}
+                //}
-                //catch (Exception ex)
+                //catch (Exception ex)
-                //{
+                //{
-                //m_log.Error("[LandManager]: IncomingLandObjectsFromStorage: Exception: " + ex.ToString());
+                //m_log.Error("[LandManager]: IncomingLandObjectsFromStorage: Exception: " + ex.ToString());
-                //throw ex;
+                //throw ex;
-                //}
+                //}
-            }
+            }
-            //foreach (LandData parcel in data)
+            //foreach (LandData parcel in data)
-            //{
+            //{
-            //    IncomingLandObjectFromStorage(parcel);
+            //    IncomingLandObjectFromStorage(parcel);
-            //}
+            //}
-        }
+        }
-        public void IncomingLandObjectFromStorage(LandData data)
+        public void IncomingLandObjectFromStorage(LandData data)
-        {
+        {
-            ILandObject new_land = new LandObject(data.ownerID, data.isGroupOwned, m_scene);
+            ILandObject new_land = new LandObject(data.ownerID, data.isGroupOwned, m_scene);
-            new_land.landData = data.Copy();
+            new_land.landData = data.Copy();
-            new_land.setLandBitmapFromByteArray();
+            new_land.setLandBitmapFromByteArray();
-            addLandObject(new_land);
+            addLandObject(new_land);
-        }
+        }
-        public void NoLandDataFromStorage()
+        public void NoLandDataFromStorage()
-        {
+        {
-            resetSimLandObjects();
+            resetSimLandObjects();
-        }
+        }
-        #endregion
+        #endregion
-        #region Parcel Add/Remove/Get/Create
+        #region Parcel Add/Remove/Get/Create
-        public void updateLandObject(int local_id, LandData newData)
+        public void updateLandObject(int local_id, LandData newData)
-        {
+        {
-            if (landList.ContainsKey(local_id))
+            if (landList.ContainsKey(local_id))
-            {
+            {
-                landList[local_id].landData = newData.Copy();
+                landList[local_id].landData = newData.Copy();
-                m_scene.EventManager.TriggerLandObjectUpdated((uint) local_id, landList[local_id]);
+                m_scene.EventManager.TriggerLandObjectUpdated((uint) local_id, landList[local_id]);
-            }
+            }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Get the land object at the specified point
+        /// Get the land object at the specified point
-        /// </summary>
+        /// </summary>
-        /// <param name="x">Value between 0 - 256 on the x axis of the point</param>
+        /// <param name="x">Value between 0 - 256 on the x axis of the point</param>
-        /// <param name="y">Value between 0 - 256 on the y axis of the point</param>
+        /// <param name="y">Value between 0 - 256 on the y axis of the point</param>
-        /// <returns>Land object at the point supplied</returns>
+        /// <returns>Land object at the point supplied</returns>
-        public ILandObject getLandObject(float x_float, float y_float)
+        public ILandObject getLandObject(float x_float, float y_float)
-        {
+        {
-            int x;
+            int x;
-            int y;
+            int y;
-            try
+            try
-            {
+            {
-                x = Convert.ToInt32(Math.Floor(Convert.ToDouble(x_float) / Convert.ToDouble(4.0)));
+                x = Convert.ToInt32(Math.Floor(Convert.ToDouble(x_float) / Convert.ToDouble(4.0)));
-                y = Convert.ToInt32(Math.Floor(Convert.ToDouble(y_float) / Convert.ToDouble(4.0)));
+                y = Convert.ToInt32(Math.Floor(Convert.ToDouble(y_float) / Convert.ToDouble(4.0)));
-            }
+            }
-            catch (OverflowException)
+            catch (OverflowException)
-            {
+            {
-                return null;
+                return null;
-            }
+            }
-            if (x >= 64 || y >= 64 || x < 0 || y < 0)
+            if (x >= 64 || y >= 64 || x < 0 || y < 0)
-            {
+            {
-                return null;
+                return null;
-            }
+            }
-            else
+            else
-            {
+            {
-                return landList[landIDList[x, y]];
+                return landList[landIDList[x, y]];
-            }
+            }
-        }
+        }
-        public ILandObject getLandObject(int x, int y)
+        public ILandObject getLandObject(int x, int y)
-        {
+        {
-            if (x >= Convert.ToInt32(Constants.RegionSize) || y >= Convert.ToInt32(Constants.RegionSize) || x < 0 || y < 0)
+            if (x >= Convert.ToInt32(Constants.RegionSize) || y >= Convert.ToInt32(Constants.RegionSize) || x < 0 || y < 0)
-            {
+            {
-                // These exceptions here will cause a lot of complaints from the users specifically because
+                // These exceptions here will cause a lot of complaints from the users specifically because
-                // they happen every time at border crossings
+                // they happen every time at border crossings
-                throw new Exception("Error: Parcel not found at point " + x + ", " + y);
+                throw new Exception("Error: Parcel not found at point " + x + ", " + y);
-            }
+            }
-            else
+            else
-            {
+            {
-                return landList[landIDList[x / 4, y / 4]];
+                return landList[landIDList[x / 4, y / 4]];
-            }
+            }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Creates a basic Parcel object without an owner (a zeroed key)
+        /// Creates a basic Parcel object without an owner (a zeroed key)
-        /// </summary>
+        /// </summary>
-        /// <returns></returns>
+        /// <returns></returns>
-        public ILandObject createBaseLand()
+        public ILandObject createBaseLand()
-        {
+        {
-            return new LandObject(LLUUID.Zero, false, m_scene);
+            return new LandObject(LLUUID.Zero, false, m_scene);
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Adds a land object to the stored list and adds them to the landIDList to what they own
+        /// Adds a land object to the stored list and adds them to the landIDList to what they own
-        /// </summary>
+        /// </summary>
-        /// <param name="new_land">The land object being added</param>
+        /// <param name="new_land">The land object being added</param>
-        public ILandObject addLandObject(ILandObject new_land)
+        public ILandObject addLandObject(ILandObject new_land)
-        {
+        {
-            lastLandLocalID++;
+            lastLandLocalID++;
-            new_land.landData.localID = lastLandLocalID;
+            new_land.landData.localID = lastLandLocalID;
-            landList.Add(lastLandLocalID, (LandObject) new_land.Copy());
+            landList.Add(lastLandLocalID, (LandObject) new_land.Copy());
-            bool[,] landBitmap = new_land.getLandBitmap();
+            bool[,] landBitmap = new_land.getLandBitmap();
-            int x, y;
+            int x, y;
-            for (x = 0; x < 64; x++)
+            for (x = 0; x < 64; x++)
-            {
+            {
-                for (y = 0; y < 64; y++)
+                for (y = 0; y < 64; y++)
-                {
+                {
-                    if (landBitmap[x, y])
+                    if (landBitmap[x, y])
-                    {
+                    {
-                        landIDList[x, y] = lastLandLocalID;
+                        landIDList[x, y] = lastLandLocalID;
-                    }
+                    }
-                }
+                }
-            }
+            }
-            landList[lastLandLocalID].forceUpdateLandInfo();
+            landList[lastLandLocalID].forceUpdateLandInfo();
-            m_scene.EventManager.TriggerLandObjectAdded(new_land);
+            m_scene.EventManager.TriggerLandObjectAdded(new_land);
-            return new_land;
+            return new_land;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Removes a land object from the list. Will not remove if local_id is still owning an area in landIDList
+        /// Removes a land object from the list. Will not remove if local_id is still owning an area in landIDList
-        /// </summary>
+        /// </summary>
-        /// <param name="local_id">Land.localID of the peice of land to remove.</param>
+        /// <param name="local_id">Land.localID of the peice of land to remove.</param>
-        public void removeLandObject(int local_id)
+        public void removeLandObject(int local_id)
-        {
+        {
-            int x, y;
+            int x, y;
-            for (x = 0; x < 64; x++)
+            for (x = 0; x < 64; x++)
-            {
+            {
-                for (y = 0; y < 64; y++)
+                for (y = 0; y < 64; y++)
-                {
+                {
-                    if (landIDList[x, y] == local_id)
+                    if (landIDList[x, y] == local_id)
-                    {
+                    {
-                        return;
+                        return;
-                        //throw new Exception("Could not remove land object. Still being used at " + x + ", " + y);
+                        //throw new Exception("Could not remove land object. Still being used at " + x + ", " + y);
-                    }
+                    }
-                }
+                }
-            }
+            }
-            m_scene.EventManager.TriggerLandObjectRemoved(landList[local_id].landData.globalID);
+            m_scene.EventManager.TriggerLandObjectRemoved(landList[local_id].landData.globalID);
-            landList.Remove(local_id);
+            landList.Remove(local_id);
-        }
+        }
-        private void performFinalLandJoin(ILandObject master, ILandObject slave)
+        private void performFinalLandJoin(ILandObject master, ILandObject slave)
-        {
+        {
-            int x, y;
+            int x, y;
-            bool[,] landBitmapSlave = slave.getLandBitmap();
+            bool[,] landBitmapSlave = slave.getLandBitmap();
-            for (x = 0; x < 64; x++)
+            for (x = 0; x < 64; x++)
-            {
+            {
-                for (y = 0; y < 64; y++)
+                for (y = 0; y < 64; y++)
-                {
+                {
-                    if (landBitmapSlave[x, y])
+                    if (landBitmapSlave[x, y])
-                    {
+                    {
-                        landIDList[x, y] = master.landData.localID;
+                        landIDList[x, y] = master.landData.localID;
-                    }
+                    }
-                }
+                }
-            }
+            }
-            removeLandObject(slave.landData.localID);
+            removeLandObject(slave.landData.localID);
-            updateLandObject(master.landData.localID, master.landData);
+            updateLandObject(master.landData.localID, master.landData);
-        }
+        }
-        public ILandObject getLandObject(int parcelLocalID)
+        public ILandObject getLandObject(int parcelLocalID)
-        {
+        {
-            lock (landList)
+            lock (landList)
-            {
+            {
-                if (landList.ContainsKey(parcelLocalID))
+                if (landList.ContainsKey(parcelLocalID))
-                {
+                {
-                    return landList[parcelLocalID];
+                    return landList[parcelLocalID];
-                }
+                }
-            }
+            }
-            return null;
+            return null;
-        }
+        }
-        #endregion
+        #endregion
-        #region Parcel Modification
+        #region Parcel Modification
-        public void resetAllLandPrimCounts()
+        public void resetAllLandPrimCounts()
-        {
+        {
-            foreach (LandObject p in landList.Values)
+            foreach (LandObject p in landList.Values)
-            {
+            {
-                p.resetLandPrimCounts();
+                p.resetLandPrimCounts();
-            }
+            }
-        }
+        }
-        public void setPrimsTainted()
+        public void setPrimsTainted()
-        {
+        {
-            landPrimCountTainted = true;
+            landPrimCountTainted = true;
-        }
+        }
-        public bool isLandPrimCountTainted()
+        public bool isLandPrimCountTainted()
-        {
+        {
-            return landPrimCountTainted;
+            return landPrimCountTainted;
-        }
+        }
-        public void addPrimToLandPrimCounts(SceneObjectGroup obj)
+        public void addPrimToLandPrimCounts(SceneObjectGroup obj)
-        {
+        {
-            LLVector3 position = obj.AbsolutePosition;
+            LLVector3 position = obj.AbsolutePosition;
-            ILandObject landUnderPrim = getLandObject(position.X, position.Y);
+            ILandObject landUnderPrim = getLandObject(position.X, position.Y);
-            if (landUnderPrim != null)
+            if (landUnderPrim != null)
-            {
+            {
-                landUnderPrim.addPrimToCount(obj);
+                landUnderPrim.addPrimToCount(obj);
-            }
+            }
-        }
+        }
-        public void removePrimFromLandPrimCounts(SceneObjectGroup obj)
+        public void removePrimFromLandPrimCounts(SceneObjectGroup obj)
-        {
+        {
-            foreach (LandObject p in landList.Values)
+            foreach (LandObject p in landList.Values)
-            {
+            {
-                p.removePrimFromCount(obj);
+                p.removePrimFromCount(obj);
-            }
+            }
-        }
+        }
-        public void finalizeLandPrimCountUpdate()
+        public void finalizeLandPrimCountUpdate()
-        {
+        {
-            //Get Simwide prim count for owner
+            //Get Simwide prim count for owner
-            Dictionary<LLUUID, List<LandObject>> landOwnersAndParcels = new Dictionary<LLUUID, List<LandObject>>();
+            Dictionary<LLUUID, List<LandObject>> landOwnersAndParcels = new Dictionary<LLUUID, List<LandObject>>();
-            foreach (LandObject p in landList.Values)
+            foreach (LandObject p in landList.Values)
-            {
+            {
-                if (!landOwnersAndParcels.ContainsKey(p.landData.ownerID))
+                if (!landOwnersAndParcels.ContainsKey(p.landData.ownerID))
-                {
+                {
-                    List<LandObject> tempList = new List<LandObject>();
+                    List<LandObject> tempList = new List<LandObject>();
-                    tempList.Add(p);
+                    tempList.Add(p);
-                    landOwnersAndParcels.Add(p.landData.ownerID, tempList);
+                    landOwnersAndParcels.Add(p.landData.ownerID, tempList);
-                }
+                }
-                else
+                else
-                {
+                {
-                    landOwnersAndParcels[p.landData.ownerID].Add(p);
+                    landOwnersAndParcels[p.landData.ownerID].Add(p);
-                }
+                }
-            }
+            }
-            foreach (LLUUID owner in landOwnersAndParcels.Keys)
+            foreach (LLUUID owner in landOwnersAndParcels.Keys)
-            {
+            {
-                int simArea = 0;
+                int simArea = 0;
-                int simPrims = 0;
+                int simPrims = 0;
-                foreach (LandObject p in landOwnersAndParcels[owner])
+                foreach (LandObject p in landOwnersAndParcels[owner])
-                {
+                {
-                    simArea += p.landData.area;
+                    simArea += p.landData.area;
-                    simPrims += p.landData.ownerPrims + p.landData.otherPrims + p.landData.groupPrims +
+                    simPrims += p.landData.ownerPrims + p.landData.otherPrims + p.landData.groupPrims +
-                                p.landData.selectedPrims;
+                                p.landData.selectedPrims;
-                }
+                }
-                foreach (LandObject p in landOwnersAndParcels[owner])
+                foreach (LandObject p in landOwnersAndParcels[owner])
-                {
+                {
-                    p.landData.simwideArea = simArea;
+                    p.landData.simwideArea = simArea;
-                    p.landData.simwidePrims = simPrims;
+                    p.landData.simwidePrims = simPrims;
-                }
+                }
-            }
+            }
-        }
+        }
-        public void updateLandPrimCounts()
+        public void updateLandPrimCounts()
-        {
+        {
-            foreach (EntityBase obj in m_scene.Entities.Values)
+            foreach (EntityBase obj in m_scene.Entities.Values)
-            {
+            {
-                if (obj is SceneObjectGroup)
+                if (obj is SceneObjectGroup)
-                {
+                {
-                    m_scene.EventManager.TriggerParcelPrimCountAdd((SceneObjectGroup) obj);
+                    m_scene.EventManager.TriggerParcelPrimCountAdd((SceneObjectGroup) obj);
-                }
+                }
-            }
+            }
-        }
+        }
-        public void performParcelPrimCountUpdate()
+        public void performParcelPrimCountUpdate()
-        {
+        {
-            resetAllLandPrimCounts();
+            resetAllLandPrimCounts();
-            m_scene.EventManager.TriggerParcelPrimCountUpdate();
+            m_scene.EventManager.TriggerParcelPrimCountUpdate();
-            finalizeLandPrimCountUpdate();
+            finalizeLandPrimCountUpdate();
-            landPrimCountTainted = false;
+            landPrimCountTainted = false;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Subdivides a piece of land
+        /// Subdivides a piece of land
-        /// </summary>
+        /// </summary>
-        /// <param name="start_x">West Point</param>
+        /// <param name="start_x">West Point</param>
-        /// <param name="start_y">South Point</param>
+        /// <param name="start_y">South Point</param>
-        /// <param name="end_x">East Point</param>
+        /// <param name="end_x">East Point</param>
-        /// <param name="end_y">North Point</param>
+        /// <param name="end_y">North Point</param>
-        /// <param name="attempting_user_id">LLUUID of user who is trying to subdivide</param>
+        /// <param name="attempting_user_id">LLUUID of user who is trying to subdivide</param>
-        /// <returns>Returns true if successful</returns>
+        /// <returns>Returns true if successful</returns>
-        private bool subdivide(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
+        private bool subdivide(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
-        {
+        {
-            //First, lets loop through the points and make sure they are all in the same peice of land
+            //First, lets loop through the points and make sure they are all in the same peice of land
-            //Get the land object at start
+            //Get the land object at start
-            ILandObject startLandObject = null;
+            ILandObject startLandObject = null;
-            try
+            try
-            {
+            {
-                startLandObject = getLandObject(start_x, start_y);
+                startLandObject = getLandObject(start_x, start_y);
-            }
+            }
-            catch (Exception)
+            catch (Exception)
-            {
+            {
-                //m_log.Error("[LAND]: " + "Unable to get land object for subdivision at x: " + start_x + " y:" + start_y);
+                //m_log.Error("[LAND]: " + "Unable to get land object for subdivision at x: " + start_x + " y:" + start_y);
-            }
+            }
-            if (startLandObject == null) return false; //No such land object at the beginning
+            if (startLandObject == null) return false; //No such land object at the beginning
-            //Loop through the points
+            //Loop through the points
-            try
+            try
-            {
+            {
-                int totalX = end_x - start_x;
+                int totalX = end_x - start_x;
-                int totalY = end_y - start_y;
+                int totalY = end_y - start_y;
-                int x, y;
+                int x, y;
-                for (y = 0; y < totalY; y++)
+                for (y = 0; y < totalY; y++)
-                {
+                {
-                    for (x = 0; x < totalX; x++)
+                    for (x = 0; x < totalX; x++)
-                    {
+                    {
-                        ILandObject tempLandObject = getLandObject(start_x + x, start_y + y);
+                        ILandObject tempLandObject = getLandObject(start_x + x, start_y + y);
-                        if (tempLandObject == null) return false; //No such land object at that point
+                        if (tempLandObject == null) return false; //No such land object at that point
-                        if (tempLandObject != startLandObject) return false; //Subdividing over 2 land objects; no-no
+                        if (tempLandObject != startLandObject) return false; //Subdividing over 2 land objects; no-no
-                    }
+                    }
-                }
+                }
-            }
+            }
-            catch (Exception)
+            catch (Exception)
-            {
+            {
-                return false; //Exception. For now, lets skip subdivision
+                return false; //Exception. For now, lets skip subdivision
-            }
+            }
-            //If we are still here, then they are subdividing within one piece of land
+            //If we are still here, then they are subdividing within one piece of land
-            //Check owner
+            //Check owner
-            if (startLandObject.landData.ownerID != attempting_user_id)
+            if (startLandObject.landData.ownerID != attempting_user_id)
-            {
+            {
-                return false; //They cant do this!
+                return false; //They cant do this!
-            }
+            }
-            //Lets create a new land object with bitmap activated at that point (keeping the old land objects info)
+            //Lets create a new land object with bitmap activated at that point (keeping the old land objects info)
-            ILandObject newLand = startLandObject.Copy();
+            ILandObject newLand = startLandObject.Copy();
-            newLand.landData.landName = "Subdivision of " + newLand.landData.landName;
+            newLand.landData.landName = "Subdivision of " + newLand.landData.landName;
-            newLand.landData.globalID = LLUUID.Random();
+            newLand.landData.globalID = LLUUID.Random();
-            newLand.setLandBitmap(newLand.getSquareLandBitmap(start_x, start_y, end_x, end_y));
+            newLand.setLandBitmap(newLand.getSquareLandBitmap(start_x, start_y, end_x, end_y));
-            //Now, lets set the subdivision area of the original to false
+            //Now, lets set the subdivision area of the original to false
-            int startLandObjectIndex = startLandObject.landData.localID;
+            int startLandObjectIndex = startLandObject.landData.localID;
-            landList[startLandObjectIndex].setLandBitmap(
+            landList[startLandObjectIndex].setLandBitmap(
-                newLand.modifyLandBitmapSquare(startLandObject.getLandBitmap(), start_x, start_y, end_x, end_y, false));
+                newLand.modifyLandBitmapSquare(startLandObject.getLandBitmap(), start_x, start_y, end_x, end_y, false));
-            landList[startLandObjectIndex].forceUpdateLandInfo();
+            landList[startLandObjectIndex].forceUpdateLandInfo();
-            setPrimsTainted();
+            setPrimsTainted();
-            //Now add the new land object
+            //Now add the new land object
-            ILandObject result = addLandObject(newLand);
+            ILandObject result = addLandObject(newLand);
-            updateLandObject(startLandObject.landData.localID, startLandObject.landData);
+            updateLandObject(startLandObject.landData.localID, startLandObject.landData);
-            result.sendLandUpdateToAvatarsOverMe();
+            result.sendLandUpdateToAvatarsOverMe();
-            return true;
+            return true;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Join 2 land objects together
+        /// Join 2 land objects together
-        /// </summary>
+        /// </summary>
-        /// <param name="start_x">x value in first piece of land</param>
+        /// <param name="start_x">x value in first piece of land</param>
-        /// <param name="start_y">y value in first piece of land</param>
+        /// <param name="start_y">y value in first piece of land</param>
-        /// <param name="end_x">x value in second peice of land</param>
+        /// <param name="end_x">x value in second peice of land</param>
-        /// <param name="end_y">y value in second peice of land</param>
+        /// <param name="end_y">y value in second peice of land</param>
-        /// <param name="attempting_user_id">LLUUID of the avatar trying to join the land objects</param>
+        /// <param name="attempting_user_id">LLUUID of the avatar trying to join the land objects</param>
-        /// <returns>Returns true if successful</returns>
+        /// <returns>Returns true if successful</returns>
-        private bool join(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
+        private bool join(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
-        {
+        {
-            end_x -= 4;
+            end_x -= 4;
-            end_y -= 4;
+            end_y -= 4;
-            List<ILandObject> selectedLandObjects = new List<ILandObject>();
+            List<ILandObject> selectedLandObjects = new List<ILandObject>();
-            int stepXSelected = 0;
+            int stepXSelected = 0;
-            int stepYSelected = 0;
+            int stepYSelected = 0;
-            for (stepYSelected = start_y; stepYSelected <= end_y; stepYSelected += 4)
+            for (stepYSelected = start_y; stepYSelected <= end_y; stepYSelected += 4)
-            {
+            {
-                for (stepXSelected = start_x; stepXSelected <= end_x; stepXSelected += 4)
+                for (stepXSelected = start_x; stepXSelected <= end_x; stepXSelected += 4)
-                {
+                {
-                    ILandObject p = null;
+                    ILandObject p = null;
-                    try
+                    try
-                    {
+                    {
-                        p = getLandObject(stepXSelected, stepYSelected);
+                        p = getLandObject(stepXSelected, stepYSelected);
-                    }
+                    }
-                    catch (Exception)
+                    catch (Exception)
-                    {
+                    {
-                        //m_log.Error("[LAND]: " + "Unable to get land object for subdivision at x: " + stepXSelected + " y:" + stepYSelected);
+                        //m_log.Error("[LAND]: " + "Unable to get land object for subdivision at x: " + stepXSelected + " y:" + stepYSelected);
-                    }
+                    }
-                    if (p != null)
+                    if (p != null)
-                    {
+                    {
-                        if (!selectedLandObjects.Contains(p))
+                        if (!selectedLandObjects.Contains(p))
-                        {
+                        {
-                            selectedLandObjects.Add(p);
+                            selectedLandObjects.Add(p);
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-            }
+            }
-            ILandObject masterLandObject = selectedLandObjects[0];
+            ILandObject masterLandObject = selectedLandObjects[0];
-            selectedLandObjects.RemoveAt(0);
+            selectedLandObjects.RemoveAt(0);
-            if (selectedLandObjects.Count < 1)
+            if (selectedLandObjects.Count < 1)
-            {
+            {
-                return false; //Only one piece of land selected
+                return false; //Only one piece of land selected
-            }
+            }
-            if (masterLandObject.landData.ownerID != attempting_user_id)
+            if (masterLandObject.landData.ownerID != attempting_user_id)
-            {
+            {
-                return false; //Not the same owner
+                return false; //Not the same owner
-            }
+            }
-            foreach (ILandObject p in selectedLandObjects)
+            foreach (ILandObject p in selectedLandObjects)
-            {
+            {
-                if (p.landData.ownerID != masterLandObject.landData.ownerID)
+                if (p.landData.ownerID != masterLandObject.landData.ownerID)
-                {
+                {
-                    return false; //Over multiple users. TODO: make this just ignore this piece of land?
+                    return false; //Over multiple users. TODO: make this just ignore this piece of land?
-                }
+                }
-            }
+            }
-            foreach (ILandObject slaveLandObject in selectedLandObjects)
+            foreach (ILandObject slaveLandObject in selectedLandObjects)
-            {
+            {
-                landList[masterLandObject.landData.localID].setLandBitmap(
+                landList[masterLandObject.landData.localID].setLandBitmap(
-                    slaveLandObject.mergeLandBitmaps(masterLandObject.getLandBitmap(), slaveLandObject.getLandBitmap()));
+                    slaveLandObject.mergeLandBitmaps(masterLandObject.getLandBitmap(), slaveLandObject.getLandBitmap()));
-                performFinalLandJoin(masterLandObject, slaveLandObject);
+                performFinalLandJoin(masterLandObject, slaveLandObject);
-            }
+            }
-            setPrimsTainted();
+            setPrimsTainted();
-            masterLandObject.sendLandUpdateToAvatarsOverMe();
+            masterLandObject.sendLandUpdateToAvatarsOverMe();
-            return true;
+            return true;
-        }
+        }
-        #endregion
+        #endregion
-        #region Parcel Updating
+        #region Parcel Updating
-        /// <summary>
+        /// <summary>
-        /// Where we send the ParcelOverlay packet to the client
+        /// Where we send the ParcelOverlay packet to the client
-        /// </summary>
+        /// </summary>
-        /// <param name="remote_client">The object representing the client</param>
+        /// <param name="remote_client">The object representing the client</param>
-        public void sendParcelOverlay(IClientAPI remote_client)
+        public void sendParcelOverlay(IClientAPI remote_client)
-        {
+        {
-            const int LAND_BLOCKS_PER_PACKET = 1024;
+            const int LAND_BLOCKS_PER_PACKET = 1024;
-            int x, y = 0;
+            int x, y = 0;
-            byte[] byteArray = new byte[LAND_BLOCKS_PER_PACKET];
+            byte[] byteArray = new byte[LAND_BLOCKS_PER_PACKET];
-            int byteArrayCount = 0;
+            int byteArrayCount = 0;
-            int sequenceID = 0;
+            int sequenceID = 0;
-            ParcelOverlayPacket packet;
+            ParcelOverlayPacket packet;
-            for (y = 0; y < 64; y++)
+            for (y = 0; y < 64; y++)
-            {
+            {
-                for (x = 0; x < 64; x++)
+                for (x = 0; x < 64; x++)
-                {
+                {
-                    byte tempByte = (byte) 0; //This represents the byte for the current 4x4
+                    byte tempByte = (byte) 0; //This represents the byte for the current 4x4
-                    ILandObject currentParcelBlock = null;
+                    ILandObject currentParcelBlock = null;
-                    try
+                    try
-                    {
+                    {
-                        currentParcelBlock = getLandObject(x * 4, y * 4);
+                        currentParcelBlock = getLandObject(x * 4, y * 4);
-                    }
+                    }
-                    catch (Exception)
+                    catch (Exception)
-                    {
+                    {
-                        //m_log.Warn("[LAND]: " + "unable to get land at x: " + (x * 4) + " y: " + (y * 4));
+                        //m_log.Warn("[LAND]: " + "unable to get land at x: " + (x * 4) + " y: " + (y * 4));
-                    }
+                    }
-                    if (currentParcelBlock != null)
+                    if (currentParcelBlock != null)
-                    {
+                    {
-                        if (currentParcelBlock.landData.ownerID == remote_client.AgentId)
+                        if (currentParcelBlock.landData.ownerID == remote_client.AgentId)
-                        {
+                        {
-                            //Owner Flag
+                            //Owner Flag
-                            tempByte = Convert.ToByte(tempByte | LAND_TYPE_OWNED_BY_REQUESTER);
+                            tempByte = Convert.ToByte(tempByte | LAND_TYPE_OWNED_BY_REQUESTER);
-                        }
+                        }
-                        else if (currentParcelBlock.landData.salePrice > 0 &&
+                        else if (currentParcelBlock.landData.salePrice > 0 &&
-                                 (currentParcelBlock.landData.authBuyerID == LLUUID.Zero ||
+                                 (currentParcelBlock.landData.authBuyerID == LLUUID.Zero ||
-                                  currentParcelBlock.landData.authBuyerID == remote_client.AgentId))
+                                  currentParcelBlock.landData.authBuyerID == remote_client.AgentId))
-                        {
+                        {
-                            //Sale Flag
+                            //Sale Flag
-                            tempByte = Convert.ToByte(tempByte | LAND_TYPE_IS_FOR_SALE);
+                            tempByte = Convert.ToByte(tempByte | LAND_TYPE_IS_FOR_SALE);
-                        }
+                        }
-                        else if (currentParcelBlock.landData.ownerID == LLUUID.Zero)
+                        else if (currentParcelBlock.landData.ownerID == LLUUID.Zero)
-                        {
+                        {
-                            //Public Flag
+                            //Public Flag
-                            tempByte = Convert.ToByte(tempByte | LAND_TYPE_PUBLIC);
+                            tempByte = Convert.ToByte(tempByte | LAND_TYPE_PUBLIC);
-                        }
+                        }
-                        else
+                        else
-                        {
+                        {
-                            //Other Flag
+                            //Other Flag
-                            tempByte = Convert.ToByte(tempByte | LAND_TYPE_OWNED_BY_OTHER);
+                            tempByte = Convert.ToByte(tempByte | LAND_TYPE_OWNED_BY_OTHER);
-                        }
+                        }
-                        //Now for border control
+                        //Now for border control
-                        try
+                        try
-                        {
+                        {
-                            ILandObject westParcel = null;
+                            ILandObject westParcel = null;
-                            ILandObject southParcel = null;
+                            ILandObject southParcel = null;
-                            if (x > 0)
+                            if (x > 0)
-                            {
+                            {
-                                westParcel = getLandObject((x - 1) * 4, y * 4);
+                                westParcel = getLandObject((x - 1) * 4, y * 4);
-                            }
+                            }
-                            if (y > 0)
+                            if (y > 0)
-                            {
+                            {
-                                southParcel = getLandObject(x * 4, (y - 1) * 4);
+                                southParcel = getLandObject(x * 4, (y - 1) * 4);
-                            }
+                            }
-                            if (x == 0)
+                            if (x == 0)
-                            {
+                            {
-                                tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_WEST);
+                                tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_WEST);
-                            }
+                            }
-                            else if (westParcel != null && westParcel != currentParcelBlock)
+                            else if (westParcel != null && westParcel != currentParcelBlock)
-                            {
+                            {
-                                tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_WEST);
+                                tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_WEST);
-                            }
+                            }
-                            if (y == 0)
+                            if (y == 0)
-                            {
+                            {
-                                tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_SOUTH);
+                                tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_SOUTH);
-                            }
+                            }
-                            else if (southParcel != null && southParcel != currentParcelBlock)
+                            else if (southParcel != null && southParcel != currentParcelBlock)
-                            {
+                            {
-                                tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_SOUTH);
+                                tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_SOUTH);
-                            }
+                            }
-                            byteArray[byteArrayCount] = tempByte;
+                            byteArray[byteArrayCount] = tempByte;
-                            byteArrayCount++;
+                            byteArrayCount++;
-                            if (byteArrayCount >= LAND_BLOCKS_PER_PACKET)
+                            if (byteArrayCount >= LAND_BLOCKS_PER_PACKET)
-                            {
+                            {
-                                byteArrayCount = 0;
+                                byteArrayCount = 0;
-                                packet = (ParcelOverlayPacket) PacketPool.Instance.GetPacket(PacketType.ParcelOverlay);
+                                packet = (ParcelOverlayPacket) PacketPool.Instance.GetPacket(PacketType.ParcelOverlay);
-                                packet.ParcelData.Data = byteArray;
+                                packet.ParcelData.Data = byteArray;
-                                packet.ParcelData.SequenceID = sequenceID;
+                                packet.ParcelData.SequenceID = sequenceID;
-                                remote_client.OutPacket((Packet) packet, ThrottleOutPacketType.Task);
+                                remote_client.OutPacket((Packet) packet, ThrottleOutPacketType.Task);
-                                sequenceID++;
+                                sequenceID++;
-                                byteArray = new byte[LAND_BLOCKS_PER_PACKET];
+                                byteArray = new byte[LAND_BLOCKS_PER_PACKET];
-                            }
+                            }
-                        }
+                        }
-                        catch (Exception)
+                        catch (Exception)
-                        {
+                        {
-                            //m_log.Debug("[LAND]: Skipped Land checks because avatar is out of bounds: " + e.Message);
+                            //m_log.Debug("[LAND]: Skipped Land checks because avatar is out of bounds: " + e.Message);
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        public void handleParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id,
+        public void handleParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id,
-                                                  bool snap_selection, IClientAPI remote_client)
+                                                  bool snap_selection, IClientAPI remote_client)
-        {
+        {
-            //Get the land objects within the bounds
+            //Get the land objects within the bounds
-            List<ILandObject> temp = new List<ILandObject>();
+            List<ILandObject> temp = new List<ILandObject>();
-            int x, y, i;
+            int x, y, i;
-            int inc_x = end_x - start_x;
+            int inc_x = end_x - start_x;
-            int inc_y = end_y - start_y;
+            int inc_y = end_y - start_y;
-            for (x = 0; x < inc_x; x++)
+            for (x = 0; x < inc_x; x++)
-            {
+            {
-                for (y = 0; y < inc_y; y++)
+                for (y = 0; y < inc_y; y++)
-                {
+                {
-                    ILandObject currentParcel = null;
+                    ILandObject currentParcel = null;
-                    try
+                    try
-                    {
+                    {
-                        currentParcel = getLandObject(start_x + x, start_y + y);
+                        currentParcel = getLandObject(start_x + x, start_y + y);
-                    }
+                    }
-                    catch (Exception)
+                    catch (Exception)
-                    {
+                    {
-                        //m_log.Warn("[LAND]: " + "unable to get land at x: " + (start_x + x) + " y: " + (start_y + y));
+                        //m_log.Warn("[LAND]: " + "unable to get land at x: " + (start_x + x) + " y: " + (start_y + y));
-                    }
+                    }
-                    if (currentParcel != null)
+                    if (currentParcel != null)
-                    {
+                    {
-                        if (!temp.Contains(currentParcel))
+                        if (!temp.Contains(currentParcel))
-                        {
+                        {
-                            currentParcel.forceUpdateLandInfo();
+                            currentParcel.forceUpdateLandInfo();
-                            temp.Add(currentParcel);
+                            temp.Add(currentParcel);
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-            }
+            }
-            int requestResult = LAND_RESULT_SINGLE;
+            int requestResult = LAND_RESULT_SINGLE;
-            if (temp.Count > 1)
+            if (temp.Count > 1)
-            {
+            {
-                requestResult = LAND_RESULT_MULTIPLE;
+                requestResult = LAND_RESULT_MULTIPLE;
-            }
+            }
-            for (i = 0; i < temp.Count; i++)
+            for (i = 0; i < temp.Count; i++)
-            {
+            {
-                temp[i].sendLandProperties(sequence_id, snap_selection, requestResult, remote_client);
+                temp[i].sendLandProperties(sequence_id, snap_selection, requestResult, remote_client);
-            }
+            }
-            sendParcelOverlay(remote_client);
+            sendParcelOverlay(remote_client);
-        }
+        }
-        public void handleParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
+        public void handleParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
-        {
+        {
-            if (landList.ContainsKey(packet.ParcelData.LocalID))
+            if (landList.ContainsKey(packet.ParcelData.LocalID))
-            {
+            {
-                landList[packet.ParcelData.LocalID].updateLandProperties(packet, remote_client);
+                landList[packet.ParcelData.LocalID].updateLandProperties(packet, remote_client);
-            }
+            }
-        }
+        }
-        public void handleParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client)
+        public void handleParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client)
-        {
+        {
-            subdivide(west, south, east, north, remote_client.AgentId);
+            subdivide(west, south, east, north, remote_client.AgentId);
-        }
+        }
-        public void handleParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client)
+        public void handleParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client)
-        {
+        {
-            join(west, south, east, north, remote_client.AgentId);
+            join(west, south, east, north, remote_client.AgentId);
-        }
+        }
-        public void handleParcelSelectObjectsRequest(int local_id, int request_type, IClientAPI remote_client)
+        public void handleParcelSelectObjectsRequest(int local_id, int request_type, IClientAPI remote_client)
-        {
+        {
-            landList[local_id].sendForceObjectSelect(local_id, request_type, remote_client);
+            landList[local_id].sendForceObjectSelect(local_id, request_type, remote_client);
-        }
+        }
-        public void handleParcelObjectOwnersRequest(int local_id, IClientAPI remote_client)
+        public void handleParcelObjectOwnersRequest(int local_id, IClientAPI remote_client)
-        {
+        {
-            landList[local_id].sendLandObjectOwners(remote_client);
+            landList[local_id].sendLandObjectOwners(remote_client);
-        }
+        }
-        #endregion
+        #endregion
-        #region ILandChannel Members
+        #region ILandChannel Members
-        public bool allowedForcefulBans
+        public bool allowedForcefulBans
-        {
+        {
-            get { return m_allowedForcefulBans; }
+            get { return m_allowedForcefulBans; }
-            set { m_allowedForcefulBans = value; }
+            set { m_allowedForcefulBans = value; }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Resets the sim to the default land object (full sim piece of land owned by the default user)
+        /// Resets the sim to the default land object (full sim piece of land owned by the default user)
-        /// </summary>
+        /// </summary>
-        public void resetSimLandObjects()
+        public void resetSimLandObjects()
-        {
+        {
-            //Remove all the land objects in the sim and add a blank, full sim land object set to public
+            //Remove all the land objects in the sim and add a blank, full sim land object set to public
-            landList.Clear();
+            landList.Clear();
-            lastLandLocalID = START_LAND_LOCAL_ID - 1;
+            lastLandLocalID = START_LAND_LOCAL_ID - 1;
-            landIDList.Initialize();
+            landIDList.Initialize();
-            ILandObject fullSimParcel = new LandObject(LLUUID.Zero, false, m_scene);
+            ILandObject fullSimParcel = new LandObject(LLUUID.Zero, false, m_scene);
-            fullSimParcel.setLandBitmap(fullSimParcel.getSquareLandBitmap(0, 0, (int) Constants.RegionSize, (int) Constants.RegionSize));
+            fullSimParcel.setLandBitmap(fullSimParcel.getSquareLandBitmap(0, 0, (int) Constants.RegionSize, (int) Constants.RegionSize));
-            fullSimParcel.landData.ownerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
+            fullSimParcel.landData.ownerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
-            addLandObject(fullSimParcel);
+            addLandObject(fullSimParcel);
-        }
+        }
-        public List<ILandObject> parcelsNearPoint(LLVector3 position)
+        public List<ILandObject> parcelsNearPoint(LLVector3 position)
-        {
+        {
-            List<ILandObject> parcelsNear = new List<ILandObject>();
+            List<ILandObject> parcelsNear = new List<ILandObject>();
-            int x, y;
+            int x, y;
-            for (x = -4; x <= 4; x += 4)
+            for (x = -4; x <= 4; x += 4)
-            {
+            {
-                for (y = -4; y <= 4; y += 4)
+                for (y = -4; y <= 4; y += 4)
-                {
+                {
-                    ILandObject check = getLandObject(position.X + x, position.Y + y);
+                    ILandObject check = getLandObject(position.X + x, position.Y + y);
-                    if (check != null)
+                    if (check != null)
-                    {
+                    {
-                        if (!parcelsNear.Contains(check))
+                        if (!parcelsNear.Contains(check))
-                        {
+                        {
-                            parcelsNear.Add(check);
+                            parcelsNear.Add(check);
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-            }
+            }
-            return parcelsNear;
+            return parcelsNear;
-        }
+        }
-        public void sendYouAreBannedNotice(ScenePresence avatar)
+        public void sendYouAreBannedNotice(ScenePresence avatar)
-        {
+        {
-            if (allowedForcefulBans)
+            if (allowedForcefulBans)
-            {
+            {
-                avatar.ControllingClient.SendAlertMessage(
+                avatar.ControllingClient.SendAlertMessage(
-                    "You are not allowed on this parcel because you are banned. Please go away. <3 OpenSim Developers");
+                    "You are not allowed on this parcel because you are banned. Please go away. <3 OpenSim Developers");
-                avatar.PhysicsActor.Position =
+                avatar.PhysicsActor.Position =
-                    new PhysicsVector(avatar.lastKnownAllowedPosition.x, avatar.lastKnownAllowedPosition.y,
+                    new PhysicsVector(avatar.lastKnownAllowedPosition.x, avatar.lastKnownAllowedPosition.y,
-                                      avatar.lastKnownAllowedPosition.z);
+                                      avatar.lastKnownAllowedPosition.z);
-                avatar.PhysicsActor.Velocity = new PhysicsVector(0, 0, 0);
+                avatar.PhysicsActor.Velocity = new PhysicsVector(0, 0, 0);
-            }
+            }
-            else
+            else
-            {
+            {
-                avatar.ControllingClient.SendAlertMessage(
+                avatar.ControllingClient.SendAlertMessage(
-                    "You are not allowed on this parcel because you are banned; however, the grid administrator has disabled ban lines globally. Please obey the land owner's requests or you can be banned from the entire sim! <3 OpenSim Developers");
+                    "You are not allowed on this parcel because you are banned; however, the grid administrator has disabled ban lines globally. Please obey the land owner's requests or you can be banned from the entire sim! <3 OpenSim Developers");
-            }
+            }
-        }
+        }
-        public void handleAvatarChangingParcel(ScenePresence avatar, int localLandID, LLUUID regionID)
+        public void handleAvatarChangingParcel(ScenePresence avatar, int localLandID, LLUUID regionID)
-        {
+        {
-            if (m_scene.RegionInfo.RegionID == regionID)
+            if (m_scene.RegionInfo.RegionID == regionID)
-            {
+            {
-                if (landList[localLandID] != null)
+                if (landList[localLandID] != null)
-                {
+                {
-                    ILandObject parcelAvatarIsEntering = landList[localLandID];
+                    ILandObject parcelAvatarIsEntering = landList[localLandID];
-                    if (avatar.AbsolutePosition.Z < BAN_LINE_SAFETY_HIEGHT)
+                    if (avatar.AbsolutePosition.Z < BAN_LINE_SAFETY_HIEGHT)
-                    {
+                    {
-                        if (parcelAvatarIsEntering.isBannedFromLand(avatar.UUID))
+                        if (parcelAvatarIsEntering.isBannedFromLand(avatar.UUID))
-                        {
+                        {
-                            sendYouAreBannedNotice(avatar);
+                            sendYouAreBannedNotice(avatar);
-                        }
+                        }
-                        else if (parcelAvatarIsEntering.isRestrictedFromLand(avatar.UUID))
+                        else if (parcelAvatarIsEntering.isRestrictedFromLand(avatar.UUID))
-                        {
+                        {
-                            avatar.ControllingClient.SendAlertMessage(
+                            avatar.ControllingClient.SendAlertMessage(
-                                "You are not allowed on this parcel because the land owner has restricted access. For now, you can enter, but please respect the land owner's decisions (or he can ban you!). <3 OpenSim Developers");
+                                "You are not allowed on this parcel because the land owner has restricted access. For now, you can enter, but please respect the land owner's decisions (or he can ban you!). <3 OpenSim Developers");
-                        }
+                        }
-                        else
+                        else
-                        {
+                        {
-                            avatar.sentMessageAboutRestrictedParcelFlyingDown = true;
+                            avatar.sentMessageAboutRestrictedParcelFlyingDown = true;
-                        }
+                        }
-                    }
+                    }
-                    else
+                    else
-                    {
+                    {
-                        avatar.sentMessageAboutRestrictedParcelFlyingDown = true;
+                        avatar.sentMessageAboutRestrictedParcelFlyingDown = true;
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        public void sendOutNearestBanLine(IClientAPI avatar)
+        public void sendOutNearestBanLine(IClientAPI avatar)
-        {
+        {
-            List<ScenePresence> avatars = m_scene.GetAvatars();
+            List<ScenePresence> avatars = m_scene.GetAvatars();
-            foreach (ScenePresence presence in avatars)
+            foreach (ScenePresence presence in avatars)
-            {
+            {
-                if (presence.UUID == avatar.AgentId)
+                if (presence.UUID == avatar.AgentId)
-                {
+                {
-                    List<ILandObject> checkLandParcels = parcelsNearPoint(presence.AbsolutePosition);
+                    List<ILandObject> checkLandParcels = parcelsNearPoint(presence.AbsolutePosition);
-                    foreach (ILandObject checkBan in checkLandParcels)
+                    foreach (ILandObject checkBan in checkLandParcels)
-                    {
+                    {
-                        if (checkBan.isBannedFromLand(avatar.AgentId))
+                        if (checkBan.isBannedFromLand(avatar.AgentId))
-                        {
+                        {
-                            checkBan.sendLandProperties(-30000, false, (int) ParcelManager.ParcelResult.Single, avatar);
+                            checkBan.sendLandProperties(-30000, false, (int) ParcelManager.ParcelResult.Single, avatar);
-                            return; //Only send one
+                            return; //Only send one
-                        }
+                        }
-                        else if (checkBan.isRestrictedFromLand(avatar.AgentId))
+                        else if (checkBan.isRestrictedFromLand(avatar.AgentId))
-                        {
+                        {
-                            checkBan.sendLandProperties(-40000, false, (int) ParcelManager.ParcelResult.Single, avatar);
+                            checkBan.sendLandProperties(-40000, false, (int) ParcelManager.ParcelResult.Single, avatar);
-                            return; //Only send one
+                            return; //Only send one
-                        }
+                        }
-                    }
+                    }
-                    return;
+                    return;
-                }
+                }
-            }
+            }
-        }
+        }
-        public void sendLandUpdate(ScenePresence avatar, bool force)
+        public void sendLandUpdate(ScenePresence avatar, bool force)
-        {
+        {
-            ILandObject over = null;
+            ILandObject over = null;
-            try
+            try
-            {
+            {
-                over = getLandObject((int) Math.Min(255, Math.Max(0, Math.Round(avatar.AbsolutePosition.X))),
+                over = getLandObject((int) Math.Min(255, Math.Max(0, Math.Round(avatar.AbsolutePosition.X))),
-                                     (int) Math.Min(255, Math.Max(0, Math.Round(avatar.AbsolutePosition.Y))));
+                                     (int) Math.Min(255, Math.Max(0, Math.Round(avatar.AbsolutePosition.Y))));
-            }
+            }
-            catch (Exception)
+            catch (Exception)
-            {
+            {
-                //m_log.Warn("[LAND]: " + "unable to get land at x: " + Math.Round(avatar.AbsolutePosition.X) + " y: " + Math.Round(avatar.AbsolutePosition.Y));
+                //m_log.Warn("[LAND]: " + "unable to get land at x: " + Math.Round(avatar.AbsolutePosition.X) + " y: " + Math.Round(avatar.AbsolutePosition.Y));
-            }
+            }
-            if (over != null)
+            if (over != null)
-            {
+            {
-                if (force)
+                if (force)
-                {
+                {
-                    if (!avatar.IsChildAgent)
+                    if (!avatar.IsChildAgent)
-                    {
+                    {
-                        over.sendLandUpdateToClient(avatar.ControllingClient);
+                        over.sendLandUpdateToClient(avatar.ControllingClient);
-                        m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.landData.localID,
+                        m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.landData.localID,
-                                                                            m_scene.RegionInfo.RegionID);
+                                                                            m_scene.RegionInfo.RegionID);
-                    }
+                    }
-                }
+                }
-                if (avatar.currentParcelUUID != over.landData.globalID)
+                if (avatar.currentParcelUUID != over.landData.globalID)
-                {
+                {
-                    if (!avatar.IsChildAgent)
+                    if (!avatar.IsChildAgent)
-                    {
+                    {
-                        over.sendLandUpdateToClient(avatar.ControllingClient);
+                        over.sendLandUpdateToClient(avatar.ControllingClient);
-                        avatar.currentParcelUUID = over.landData.globalID;
+                        avatar.currentParcelUUID = over.landData.globalID;
-                        m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.landData.localID,
+                        m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.landData.localID,
-                                                                            m_scene.RegionInfo.RegionID);
+                                                                            m_scene.RegionInfo.RegionID);
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        public void sendLandUpdate(ScenePresence avatar)
+        public void sendLandUpdate(ScenePresence avatar)
-        {
+        {
-            sendLandUpdate(avatar, false);
+            sendLandUpdate(avatar, false);
-        }
+        }
-        public void handleSignificantClientMovement(IClientAPI remote_client)
+        public void handleSignificantClientMovement(IClientAPI remote_client)
-        {
+        {
-            ScenePresence clientAvatar = m_scene.GetScenePresence(remote_client.AgentId);
+            ScenePresence clientAvatar = m_scene.GetScenePresence(remote_client.AgentId);
-            if (clientAvatar != null)
+            if (clientAvatar != null)
-            {
+            {
-                sendLandUpdate(clientAvatar);
+                sendLandUpdate(clientAvatar);
-                sendOutNearestBanLine(remote_client);
+                sendOutNearestBanLine(remote_client);
-                ILandObject parcel = getLandObject(clientAvatar.AbsolutePosition.X, clientAvatar.AbsolutePosition.Y);
+                ILandObject parcel = getLandObject(clientAvatar.AbsolutePosition.X, clientAvatar.AbsolutePosition.Y);
-                if (parcel != null)
+                if (parcel != null)
-                {
+                {
-                    if (clientAvatar.AbsolutePosition.Z < BAN_LINE_SAFETY_HIEGHT &&
+                    if (clientAvatar.AbsolutePosition.Z < BAN_LINE_SAFETY_HIEGHT &&
-                        clientAvatar.sentMessageAboutRestrictedParcelFlyingDown)
+                        clientAvatar.sentMessageAboutRestrictedParcelFlyingDown)
-                    {
+                    {
-                        handleAvatarChangingParcel(clientAvatar, parcel.landData.localID, m_scene.RegionInfo.RegionID);
+                        handleAvatarChangingParcel(clientAvatar, parcel.landData.localID, m_scene.RegionInfo.RegionID);
-                        //They are going below the safety line!
+                        //They are going below the safety line!
-                        if (!parcel.isBannedFromLand(clientAvatar.UUID))
+                        if (!parcel.isBannedFromLand(clientAvatar.UUID))
-                        {
+                        {
-                            clientAvatar.sentMessageAboutRestrictedParcelFlyingDown = false;
+                            clientAvatar.sentMessageAboutRestrictedParcelFlyingDown = false;
-                        }
+                        }
-                    }
+                    }
-                    else if (clientAvatar.AbsolutePosition.Z < BAN_LINE_SAFETY_HIEGHT &&
+                    else if (clientAvatar.AbsolutePosition.Z < BAN_LINE_SAFETY_HIEGHT &&
-                             parcel.isBannedFromLand(clientAvatar.UUID))
+                             parcel.isBannedFromLand(clientAvatar.UUID))
-                    {
+                    {
-                        sendYouAreBannedNotice(clientAvatar);
+                        sendYouAreBannedNotice(clientAvatar);
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        public void handleAnyClientMovement(ScenePresence avatar)
+        public void handleAnyClientMovement(ScenePresence avatar)
-            //Like handleSignificantClientMovement, but called with an AgentUpdate regardless of distance. 
+            //Like handleSignificantClientMovement, but called with an AgentUpdate regardless of distance. 
-        {
+        {
-            ILandObject over = getLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+            ILandObject over = getLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
-            if (over != null)
+            if (over != null)
-            {
+            {
-                if (!over.isBannedFromLand(avatar.UUID) || avatar.AbsolutePosition.Z >= BAN_LINE_SAFETY_HIEGHT)
+                if (!over.isBannedFromLand(avatar.UUID) || avatar.AbsolutePosition.Z >= BAN_LINE_SAFETY_HIEGHT)
-                {
+                {
-                    avatar.lastKnownAllowedPosition =
+                    avatar.lastKnownAllowedPosition =
-                        new Vector3(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z);
+                        new Vector3(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z);
-                }
+                }
-            }
+            }
-        }
+        }
-        public void handleParcelAccessRequest(LLUUID agentID, LLUUID sessionID, uint flags, int sequenceID,
+        public void handleParcelAccessRequest(LLUUID agentID, LLUUID sessionID, uint flags, int sequenceID,
-                                              int landLocalID, IClientAPI remote_client)
+                                              int landLocalID, IClientAPI remote_client)
-        {
+        {
-            if (landList.ContainsKey(landLocalID))
+            if (landList.ContainsKey(landLocalID))
-            {
+            {
-                landList[landLocalID].sendAccessList(agentID, sessionID, flags, sequenceID, remote_client);
+                landList[landLocalID].sendAccessList(agentID, sessionID, flags, sequenceID, remote_client);
-            }
+            }
-        }
+        }
-        public void handleParcelAccessUpdateRequest(LLUUID agentID, LLUUID sessionID, uint flags, int landLocalID,
+        public void handleParcelAccessUpdateRequest(LLUUID agentID, LLUUID sessionID, uint flags, int landLocalID,
-                                                    List<ParcelManager.ParcelAccessEntry> entries,
+                                                    List<ParcelManager.ParcelAccessEntry> entries,
-                                                    IClientAPI remote_client)
+                                                    IClientAPI remote_client)
-        {
+        {
-            if (landList.ContainsKey(landLocalID))
+            if (landList.ContainsKey(landLocalID))
-            {
+            {
-                if (agentID == landList[landLocalID].landData.ownerID)
+                if (agentID == landList[landLocalID].landData.ownerID)
-                {
+                {
-                    landList[landLocalID].updateAccessList(flags, entries, remote_client);
+                    landList[landLocalID].updateAccessList(flags, entries, remote_client);
-                }
+                }
-            }
+            }
-            else
+            else
-            {
+            {
-                Console.WriteLine("INVALID LOCAL LAND ID");
+                Console.WriteLine("INVALID LOCAL LAND ID");
-            }
+            }
-        }
+        }
-        #endregion
+        #endregion
-        // If the economy has been validated by the economy module,
+        // If the economy has been validated by the economy module,
-        // and land has been validated as well, this method transfers
+        // and land has been validated as well, this method transfers
-        // the land ownership
+        // the land ownership
-        public void handleLandBuyRequest(Object o, EventManager.LandBuyArgs e)
+        public void handleLandBuyRequest(Object o, EventManager.LandBuyArgs e)
-        {
+        {
-            if (e.economyValidated && e.landValidated)
+            if (e.economyValidated && e.landValidated)
-            {
+            {
-                lock (landList)
+                lock (landList)
-                {
+                {
-                    if (landList.ContainsKey(e.parcelLocalID))
+                    if (landList.ContainsKey(e.parcelLocalID))
-                    {
+                    {
-                        landList[e.parcelLocalID].updateLandSold(e.agentId, e.groupId, e.groupOwned, (uint) e.transactionID, e.parcelPrice, e.parcelArea);
+                        landList[e.parcelLocalID].updateLandSold(e.agentId, e.groupId, e.groupOwned, (uint) e.transactionID, e.parcelPrice, e.parcelArea);
-                        return;
+                        return;
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        // After receiving a land buy packet, first the data needs to
+        // After receiving a land buy packet, first the data needs to
-        // be validated. This method validates the right to buy the
+        // be validated. This method validates the right to buy the
-        // parcel
+        // parcel
-        public void handleLandValidationRequest(Object o, EventManager.LandBuyArgs e)
+        public void handleLandValidationRequest(Object o, EventManager.LandBuyArgs e)
-        {
+        {
-            if (e.landValidated == false)
+            if (e.landValidated == false)
-            {
+            {
-                ILandObject lob = null;
+                ILandObject lob = null;
-                lock (landList)
+                lock (landList)
-                {
+                {
-                    if (landList.ContainsKey(e.parcelLocalID))
+                    if (landList.ContainsKey(e.parcelLocalID))
-                    {
+                    {
-                        lob = landList[e.parcelLocalID];
+                        lob = landList[e.parcelLocalID];
-                    }
+                    }
-                }
+                }
-                if (lob != null)
+                if (lob != null)
-                {
+                {
-                    LLUUID AuthorizedID = lob.landData.authBuyerID;
+                    LLUUID AuthorizedID = lob.landData.authBuyerID;
-                    int saleprice = lob.landData.salePrice;
+                    int saleprice = lob.landData.salePrice;
-                    LLUUID pOwnerID = lob.landData.ownerID;
+                    LLUUID pOwnerID = lob.landData.ownerID;
-                    bool landforsale = ((lob.landData.landFlags &
+                    bool landforsale = ((lob.landData.landFlags &
-                                         (uint) (Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects)) != 0);
+                                         (uint) (Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects)) != 0);
-                    if ((AuthorizedID == LLUUID.Zero || AuthorizedID == e.agentId) && e.parcelPrice >= saleprice && landforsale)
+                    if ((AuthorizedID == LLUUID.Zero || AuthorizedID == e.agentId) && e.parcelPrice >= saleprice && landforsale)
-                    {
+                    {
-                        lock (e)
+                        lock (e)
-                        {
+                        {
-                            e.parcelOwnerID = pOwnerID;
+                            e.parcelOwnerID = pOwnerID;
-                            e.landValidated = true;
+                            e.landValidated = true;
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-    }
+    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
index 3f09bd5..877bed5 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
@@ -1,79 +1,79 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using Nini.Config;
+using Nini.Config;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules.World.Land
+namespace OpenSim.Region.Environment.Modules.World.Land
-{
+{
-    public class LandManagementModule : IRegionModule
+    public class LandManagementModule : IRegionModule
-    {
+    {
-        private LandChannel landChannel;
+        private LandChannel landChannel;
-        private Scene m_scene;
+        private Scene m_scene;
-        #region IRegionModule Members
+        #region IRegionModule Members
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(Scene scene, IConfigSource source)
-        {
+        {
-            m_scene = scene;
+            m_scene = scene;
-            landChannel = new LandChannel(scene);
+            landChannel = new LandChannel(scene);
-            m_scene.EventManager.OnParcelPrimCountAdd += landChannel.addPrimToLandPrimCounts;
+            m_scene.EventManager.OnParcelPrimCountAdd += landChannel.addPrimToLandPrimCounts;
-            m_scene.EventManager.OnParcelPrimCountUpdate += landChannel.updateLandPrimCounts;
+            m_scene.EventManager.OnParcelPrimCountUpdate += landChannel.updateLandPrimCounts;
-            m_scene.EventManager.OnAvatarEnteringNewParcel += new EventManager.AvatarEnteringNewParcel(landChannel.handleAvatarChangingParcel);
+            m_scene.EventManager.OnAvatarEnteringNewParcel += new EventManager.AvatarEnteringNewParcel(landChannel.handleAvatarChangingParcel);
-            m_scene.EventManager.OnClientMovement += new EventManager.ClientMovement(landChannel.handleAnyClientMovement);
+            m_scene.EventManager.OnClientMovement += new EventManager.ClientMovement(landChannel.handleAnyClientMovement);
-            m_scene.EventManager.OnValidateLandBuy += landChannel.handleLandValidationRequest;
+            m_scene.EventManager.OnValidateLandBuy += landChannel.handleLandValidationRequest;
-            m_scene.EventManager.OnLandBuy += landChannel.handleLandBuyRequest;
+            m_scene.EventManager.OnLandBuy += landChannel.handleLandBuyRequest;
-            lock (m_scene)
+            lock (m_scene)
-            {
+            {
-                m_scene.LandChannel = (ILandChannel) landChannel;
+                m_scene.LandChannel = (ILandChannel) landChannel;
-            }
+            }
-        }
+        }
-        public void PostInitialise()
+        public void PostInitialise()
-        {
+        {
-        }
+        }
-        public void Close()
+        public void Close()
-        {
+        {
-        }
+        }
-        public string Name
+        public string Name
-        {
+        {
-            get { return "LandManagementModule"; }
+            get { return "LandManagementModule"; }
-        }
+        }
-        public bool IsSharedModule
+        public bool IsSharedModule
-        {
+        {
-            get { return false; }
+            get { return false; }
-        }
+        }
-        #endregion
+        #endregion
-    }
+    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
index 368e113..e297b10 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
@@ -1,928 +1,928 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
-using libsecondlife;
+using libsecondlife;
-using libsecondlife.Packets;
+using libsecondlife.Packets;
-using log4net;
+using log4net;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules.World.Land
+namespace OpenSim.Region.Environment.Modules.World.Land
-{
+{
-    /// <summary>
+    /// <summary>
-    /// Keeps track of a specific piece of land's information
+    /// Keeps track of a specific piece of land's information
-    /// </summary>
+    /// </summary>
-    public class LandObject : ILandObject
+    public class LandObject : ILandObject
-    {
+    {
-        #region Member Variables
+        #region Member Variables
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private bool[,] m_landBitmap = new bool[64,64];
+        private bool[,] m_landBitmap = new bool[64,64];
-        protected LandData m_landData = new LandData();
+        protected LandData m_landData = new LandData();
-        protected Scene m_scene;
+        protected Scene m_scene;
-        protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>();
+        protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>();
-        public bool[,] landBitmap
+        public bool[,] landBitmap
-        {
+        {
-            get { return m_landBitmap; }
+            get { return m_landBitmap; }
-            set { m_landBitmap = value; }
+            set { m_landBitmap = value; }
-        }
+        }
-        #endregion
+        #endregion
-        #region ILandObject Members
+        #region ILandObject Members
-        public LandData landData
+        public LandData landData
-        {
+        {
-            get { return m_landData; }
+            get { return m_landData; }
-            set { m_landData = value; }
+            set { m_landData = value; }
-        }
+        }
-        public LLUUID regionUUID
+        public LLUUID regionUUID
-        {
+        {
-            get { return m_scene.RegionInfo.RegionID; }
+            get { return m_scene.RegionInfo.RegionID; }
-        }
+        }
-        #region Constructors
+        #region Constructors
-        public LandObject(LLUUID owner_id, bool is_group_owned, Scene scene)
+        public LandObject(LLUUID owner_id, bool is_group_owned, Scene scene)
-        {
+        {
-            m_scene = scene;
+            m_scene = scene;
-            landData.ownerID = owner_id;
+            landData.ownerID = owner_id;
-            landData.isGroupOwned = is_group_owned;
+            landData.isGroupOwned = is_group_owned;
-        }
+        }
-        #endregion
+        #endregion
-        #region Member Functions
+        #region Member Functions
-        #region General Functions
+        #region General Functions
-        /// <summary>
+        /// <summary>
-        /// Checks to see if this land object contains a point
+        /// Checks to see if this land object contains a point
-        /// </summary>
+        /// </summary>
-        /// <param name="x"></param>
+        /// <param name="x"></param>
-        /// <param name="y"></param>
+        /// <param name="y"></param>
-        /// <returns>Returns true if the piece of land contains the specified point</returns>
+        /// <returns>Returns true if the piece of land contains the specified point</returns>
-        public bool containsPoint(int x, int y)
+        public bool containsPoint(int x, int y)
-        {
+        {
-            if (x >= 0 && y >= 0 && x <= Constants.RegionSize && x <= Constants.RegionSize)
+            if (x >= 0 && y >= 0 && x <= Constants.RegionSize && x <= Constants.RegionSize)
-            {
+            {
-                return (landBitmap[x / 4, y / 4] == true);
+                return (landBitmap[x / 4, y / 4] == true);
-            }
+            }
-            else
+            else
-            {
+            {
-                return false;
+                return false;
-            }
+            }
-        }
+        }
-        public ILandObject Copy()
+        public ILandObject Copy()
-        {
+        {
-            ILandObject newLand = new LandObject(landData.ownerID, landData.isGroupOwned, m_scene);
+            ILandObject newLand = new LandObject(landData.ownerID, landData.isGroupOwned, m_scene);
-            //Place all new variables here!
+            //Place all new variables here!
-            newLand.landBitmap = (bool[,]) (landBitmap.Clone());
+            newLand.landBitmap = (bool[,]) (landBitmap.Clone());
-            newLand.landData = landData.Copy();
+            newLand.landData = landData.Copy();
-            return newLand;
+            return newLand;
-        }
+        }
-        #endregion
+        #endregion
-        #region Packet Request Handling
+        #region Packet Request Handling
-        /// <summary>
+        /// <summary>
-        /// Sends land properties as requested
+        /// Sends land properties as requested
-        /// </summary>
+        /// </summary>
-        /// <param name="sequence_id">ID sent by client for them to keep track of</param>
+        /// <param name="sequence_id">ID sent by client for them to keep track of</param>
-        /// <param name="snap_selection">Bool sent by client for them to use</param>
+        /// <param name="snap_selection">Bool sent by client for them to use</param>
-        /// <param name="remote_client">Object representing the client</param>
+        /// <param name="remote_client">Object representing the client</param>
-        public void sendLandProperties(int sequence_id, bool snap_selection, int request_result,
+        public void sendLandProperties(int sequence_id, bool snap_selection, int request_result,
-                                       IClientAPI remote_client)
+                                       IClientAPI remote_client)
-        {
+        {
-            ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket) PacketPool.Instance.GetPacket(PacketType.ParcelProperties);
+            ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket) PacketPool.Instance.GetPacket(PacketType.ParcelProperties);
-            // TODO: don't create new blocks if recycling an old packet
+            // TODO: don't create new blocks if recycling an old packet
-            updatePacket.ParcelData.AABBMax = landData.AABBMax;
+            updatePacket.ParcelData.AABBMax = landData.AABBMax;
-            updatePacket.ParcelData.AABBMin = landData.AABBMin;
+            updatePacket.ParcelData.AABBMin = landData.AABBMin;
-            updatePacket.ParcelData.Area = landData.area;
+            updatePacket.ParcelData.Area = landData.area;
-            updatePacket.ParcelData.AuctionID = landData.auctionID;
+            updatePacket.ParcelData.AuctionID = landData.auctionID;
-            updatePacket.ParcelData.AuthBuyerID = landData.authBuyerID; //unemplemented
+            updatePacket.ParcelData.AuthBuyerID = landData.authBuyerID; //unemplemented
-            updatePacket.ParcelData.Bitmap = landData.landBitmapByteArray;
+            updatePacket.ParcelData.Bitmap = landData.landBitmapByteArray;
-            updatePacket.ParcelData.Desc = Helpers.StringToField(landData.landDesc);
+            updatePacket.ParcelData.Desc = Helpers.StringToField(landData.landDesc);
-            updatePacket.ParcelData.Category = (byte) landData.category;
+            updatePacket.ParcelData.Category = (byte) landData.category;
-            updatePacket.ParcelData.ClaimDate = landData.claimDate;
+            updatePacket.ParcelData.ClaimDate = landData.claimDate;
-            updatePacket.ParcelData.ClaimPrice = landData.claimPrice;
+            updatePacket.ParcelData.ClaimPrice = landData.claimPrice;
-            updatePacket.ParcelData.GroupID = landData.groupID;
+            updatePacket.ParcelData.GroupID = landData.groupID;
-            updatePacket.ParcelData.GroupPrims = landData.groupPrims;
+            updatePacket.ParcelData.GroupPrims = landData.groupPrims;
-            updatePacket.ParcelData.IsGroupOwned = landData.isGroupOwned;
+            updatePacket.ParcelData.IsGroupOwned = landData.isGroupOwned;
-            updatePacket.ParcelData.LandingType = (byte) landData.landingType;
+            updatePacket.ParcelData.LandingType = (byte) landData.landingType;
-            updatePacket.ParcelData.LocalID = landData.localID;
+            updatePacket.ParcelData.LocalID = landData.localID;
-            if (landData.area > 0)
+            if (landData.area > 0)
-            {
+            {
-                updatePacket.ParcelData.MaxPrims =
+                updatePacket.ParcelData.MaxPrims =
-                    Convert.ToInt32(
+                    Convert.ToInt32(
-                        Math.Round((Convert.ToDecimal(landData.area) / Convert.ToDecimal(65536)) * m_scene.objectCapacity *
+                        Math.Round((Convert.ToDecimal(landData.area) / Convert.ToDecimal(65536)) * m_scene.objectCapacity *
-                                   Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor)));
+                                   Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor)));
-            }
+            }
-            else
+            else
-            {
+            {
-                updatePacket.ParcelData.MaxPrims = 0;
+                updatePacket.ParcelData.MaxPrims = 0;
-            }
+            }
-            updatePacket.ParcelData.MediaAutoScale = landData.mediaAutoScale;
+            updatePacket.ParcelData.MediaAutoScale = landData.mediaAutoScale;
-            updatePacket.ParcelData.MediaID = landData.mediaID;
+            updatePacket.ParcelData.MediaID = landData.mediaID;
-            updatePacket.ParcelData.MediaURL = Helpers.StringToField(landData.mediaURL);
+            updatePacket.ParcelData.MediaURL = Helpers.StringToField(landData.mediaURL);
-            updatePacket.ParcelData.MusicURL = Helpers.StringToField(landData.musicURL);
+            updatePacket.ParcelData.MusicURL = Helpers.StringToField(landData.musicURL);
-            updatePacket.ParcelData.Name = Helpers.StringToField(landData.landName);
+            updatePacket.ParcelData.Name = Helpers.StringToField(landData.landName);
-            updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented
+            updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented
-            updatePacket.ParcelData.OtherCount = 0; //unemplemented
+            updatePacket.ParcelData.OtherCount = 0; //unemplemented
-            updatePacket.ParcelData.OtherPrims = landData.otherPrims;
+            updatePacket.ParcelData.OtherPrims = landData.otherPrims;
-            updatePacket.ParcelData.OwnerID = landData.ownerID;
+            updatePacket.ParcelData.OwnerID = landData.ownerID;
-            updatePacket.ParcelData.OwnerPrims = landData.ownerPrims;
+            updatePacket.ParcelData.OwnerPrims = landData.ownerPrims;
-            updatePacket.ParcelData.ParcelFlags = landData.landFlags;
+            updatePacket.ParcelData.ParcelFlags = landData.landFlags;
-            updatePacket.ParcelData.ParcelPrimBonus = m_scene.RegionInfo.EstateSettings.objectBonusFactor;
+            updatePacket.ParcelData.ParcelPrimBonus = m_scene.RegionInfo.EstateSettings.objectBonusFactor;
-            updatePacket.ParcelData.PassHours = landData.passHours;
+            updatePacket.ParcelData.PassHours = landData.passHours;
-            updatePacket.ParcelData.PassPrice = landData.passPrice;
+            updatePacket.ParcelData.PassPrice = landData.passPrice;
-            updatePacket.ParcelData.PublicCount = 0; //unemplemented
+            updatePacket.ParcelData.PublicCount = 0; //unemplemented
-            uint regionFlags = (uint) m_scene.RegionInfo.EstateSettings.regionFlags;
+            uint regionFlags = (uint) m_scene.RegionInfo.EstateSettings.regionFlags;
-            updatePacket.ParcelData.RegionDenyAnonymous = ((regionFlags & (uint) Simulator.RegionFlags.DenyAnonymous) >
+            updatePacket.ParcelData.RegionDenyAnonymous = ((regionFlags & (uint) Simulator.RegionFlags.DenyAnonymous) >
-                                                           0);
+                                                           0);
-            updatePacket.ParcelData.RegionDenyIdentified = ((regionFlags & (uint) Simulator.RegionFlags.DenyIdentified) >
+            updatePacket.ParcelData.RegionDenyIdentified = ((regionFlags & (uint) Simulator.RegionFlags.DenyIdentified) >
-                                                            0);
+                                                            0);
-            updatePacket.ParcelData.RegionDenyTransacted = ((regionFlags & (uint) Simulator.RegionFlags.DenyTransacted) >
+            updatePacket.ParcelData.RegionDenyTransacted = ((regionFlags & (uint) Simulator.RegionFlags.DenyTransacted) >
-                                                            0);
+                                                            0);
-            updatePacket.ParcelData.RegionPushOverride = ((regionFlags & (uint) Simulator.RegionFlags.RestrictPushObject) >
+            updatePacket.ParcelData.RegionPushOverride = ((regionFlags & (uint) Simulator.RegionFlags.RestrictPushObject) >
-                                                          0);
+                                                          0);
-            updatePacket.ParcelData.RentPrice = 0;
+            updatePacket.ParcelData.RentPrice = 0;
-            updatePacket.ParcelData.RequestResult = request_result;
+            updatePacket.ParcelData.RequestResult = request_result;
-            updatePacket.ParcelData.SalePrice = landData.salePrice;
+            updatePacket.ParcelData.SalePrice = landData.salePrice;
-            updatePacket.ParcelData.SelectedPrims = landData.selectedPrims;
+            updatePacket.ParcelData.SelectedPrims = landData.selectedPrims;
-            updatePacket.ParcelData.SelfCount = 0; //unemplemented
+            updatePacket.ParcelData.SelfCount = 0; //unemplemented
-            updatePacket.ParcelData.SequenceID = sequence_id;
+            updatePacket.ParcelData.SequenceID = sequence_id;
-            if (landData.simwideArea > 0)
+            if (landData.simwideArea > 0)
-            {
+            {
-                updatePacket.ParcelData.SimWideMaxPrims =
+                updatePacket.ParcelData.SimWideMaxPrims =
-                    Convert.ToInt32(
+                    Convert.ToInt32(
-                        Math.Round((Convert.ToDecimal(landData.simwideArea) / Convert.ToDecimal(65536)) * m_scene.objectCapacity *
+                        Math.Round((Convert.ToDecimal(landData.simwideArea) / Convert.ToDecimal(65536)) * m_scene.objectCapacity *
-                                   Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor)));
+                                   Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor)));
-            }
+            }
-            else
+            else
-            {
+            {
-                updatePacket.ParcelData.SimWideMaxPrims = 0;
+                updatePacket.ParcelData.SimWideMaxPrims = 0;
-            }
+            }
-            updatePacket.ParcelData.SimWideTotalPrims = landData.simwidePrims;
+            updatePacket.ParcelData.SimWideTotalPrims = landData.simwidePrims;
-            updatePacket.ParcelData.SnapSelection = snap_selection;
+            updatePacket.ParcelData.SnapSelection = snap_selection;
-            updatePacket.ParcelData.SnapshotID = landData.snapshotID;
+            updatePacket.ParcelData.SnapshotID = landData.snapshotID;
-            updatePacket.ParcelData.Status = (byte) landData.landStatus;
+            updatePacket.ParcelData.Status = (byte) landData.landStatus;
-            updatePacket.ParcelData.TotalPrims = landData.ownerPrims + landData.groupPrims + landData.otherPrims +
+            updatePacket.ParcelData.TotalPrims = landData.ownerPrims + landData.groupPrims + landData.otherPrims +
-                                                 landData.selectedPrims;
+                                                 landData.selectedPrims;
-            updatePacket.ParcelData.UserLocation = landData.userLocation;
+            updatePacket.ParcelData.UserLocation = landData.userLocation;
-            updatePacket.ParcelData.UserLookAt = landData.userLookAt;
+            updatePacket.ParcelData.UserLookAt = landData.userLookAt;
-            remote_client.OutPacket((Packet) updatePacket, ThrottleOutPacketType.Task);
+            remote_client.OutPacket((Packet) updatePacket, ThrottleOutPacketType.Task);
-        }
+        }
-        public void updateLandProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
+        public void updateLandProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
-        {
+        {
-            if (remote_client.AgentId == landData.ownerID)
+            if (remote_client.AgentId == landData.ownerID)
-            {
+            {
-                //Needs later group support
+                //Needs later group support
-                LandData newData = landData.Copy();
+                LandData newData = landData.Copy();
-                newData.authBuyerID = packet.ParcelData.AuthBuyerID;
+                newData.authBuyerID = packet.ParcelData.AuthBuyerID;
-                newData.category = (Parcel.ParcelCategory) packet.ParcelData.Category;
+                newData.category = (Parcel.ParcelCategory) packet.ParcelData.Category;
-                newData.landDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc);
+                newData.landDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc);
-                newData.groupID = packet.ParcelData.GroupID;
+                newData.groupID = packet.ParcelData.GroupID;
-                newData.landingType = packet.ParcelData.LandingType;
+                newData.landingType = packet.ParcelData.LandingType;
-                newData.mediaAutoScale = packet.ParcelData.MediaAutoScale;
+                newData.mediaAutoScale = packet.ParcelData.MediaAutoScale;
-                newData.mediaID = packet.ParcelData.MediaID;
+                newData.mediaID = packet.ParcelData.MediaID;
-                newData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);
+                newData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);
-                newData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);
+                newData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);
-                newData.landName = Helpers.FieldToUTF8String(packet.ParcelData.Name);
+                newData.landName = Helpers.FieldToUTF8String(packet.ParcelData.Name);
-                newData.landFlags = packet.ParcelData.ParcelFlags;
+                newData.landFlags = packet.ParcelData.ParcelFlags;
-                newData.passHours = packet.ParcelData.PassHours;
+                newData.passHours = packet.ParcelData.PassHours;
-                newData.passPrice = packet.ParcelData.PassPrice;
+                newData.passPrice = packet.ParcelData.PassPrice;
-                newData.salePrice = packet.ParcelData.SalePrice;
+                newData.salePrice = packet.ParcelData.SalePrice;
-                newData.snapshotID = packet.ParcelData.SnapshotID;
+                newData.snapshotID = packet.ParcelData.SnapshotID;
-                newData.userLocation = packet.ParcelData.UserLocation;
+                newData.userLocation = packet.ParcelData.UserLocation;
-                newData.userLookAt = packet.ParcelData.UserLookAt;
+                newData.userLookAt = packet.ParcelData.UserLookAt;
-                m_scene.LandChannel.updateLandObject(landData.localID, newData);
+                m_scene.LandChannel.updateLandObject(landData.localID, newData);
-                sendLandUpdateToAvatarsOverMe();
+                sendLandUpdateToAvatarsOverMe();
-            }
+            }
-        }
+        }
-        public void updateLandSold(LLUUID avatarID, LLUUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area)
+        public void updateLandSold(LLUUID avatarID, LLUUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area)
-        {
+        {
-            LandData newData = landData.Copy();
+            LandData newData = landData.Copy();
-            newData.ownerID = avatarID;
+            newData.ownerID = avatarID;
-            newData.groupID = groupID;
+            newData.groupID = groupID;
-            newData.isGroupOwned = groupOwned;
+            newData.isGroupOwned = groupOwned;
-            //newData.auctionID = AuctionID;
+            //newData.auctionID = AuctionID;
-            newData.claimDate = Util.UnixTimeSinceEpoch();
+            newData.claimDate = Util.UnixTimeSinceEpoch();
-            newData.claimPrice = claimprice;
+            newData.claimPrice = claimprice;
-            newData.salePrice = 0;
+            newData.salePrice = 0;
-            newData.authBuyerID = LLUUID.Zero;
+            newData.authBuyerID = LLUUID.Zero;
-            newData.landFlags &= ~(uint) (Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects);
+            newData.landFlags &= ~(uint) (Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects);
-            m_scene.LandChannel.updateLandObject(landData.localID, newData);
+            m_scene.LandChannel.updateLandObject(landData.localID, newData);
-            sendLandUpdateToAvatarsOverMe();
+            sendLandUpdateToAvatarsOverMe();
-        }
+        }
-        public bool isEitherBannedOrRestricted(LLUUID avatar)
+        public bool isEitherBannedOrRestricted(LLUUID avatar)
-        {
+        {
-            if (isBannedFromLand(avatar))
+            if (isBannedFromLand(avatar))
-            {
+            {
-                return true;
+                return true;
-            }
+            }
-            else if (isRestrictedFromLand(avatar))
+            else if (isRestrictedFromLand(avatar))
-            {
+            {
-                return true;
+                return true;
-            }
+            }
-            return false;
+            return false;
-        }
+        }
-        public bool isBannedFromLand(LLUUID avatar)
+        public bool isBannedFromLand(LLUUID avatar)
-        {
+        {
-            if ((landData.landFlags & (uint) Parcel.ParcelFlags.UseBanList) > 0)
+            if ((landData.landFlags & (uint) Parcel.ParcelFlags.UseBanList) > 0)
-            {
+            {
-                ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
+                ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
-                entry.AgentID = avatar;
+                entry.AgentID = avatar;
-                entry.Flags = ParcelManager.AccessList.Ban;
+                entry.Flags = ParcelManager.AccessList.Ban;
-                entry.Time = new DateTime();
+                entry.Time = new DateTime();
-                if (landData.parcelAccessList.Contains(entry))
+                if (landData.parcelAccessList.Contains(entry))
-                {
+                {
-                    //They are banned, so lets send them a notice about this parcel
+                    //They are banned, so lets send them a notice about this parcel
-                    return true;
+                    return true;
-                }
+                }
-            }
+            }
-            return false;
+            return false;
-        }
+        }
-        public bool isRestrictedFromLand(LLUUID avatar)
+        public bool isRestrictedFromLand(LLUUID avatar)
-        {
+        {
-            if ((landData.landFlags & (uint) Parcel.ParcelFlags.UseAccessList) > 0)
+            if ((landData.landFlags & (uint) Parcel.ParcelFlags.UseAccessList) > 0)
-            {
+            {
-                ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
+                ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
-                entry.AgentID = avatar;
+                entry.AgentID = avatar;
-                entry.Flags = ParcelManager.AccessList.Access;
+                entry.Flags = ParcelManager.AccessList.Access;
-                entry.Time = new DateTime();
+                entry.Time = new DateTime();
-                if (!landData.parcelAccessList.Contains(entry))
+                if (!landData.parcelAccessList.Contains(entry))
-                {
+                {
-                    //They are not allowed in this parcel, but not banned, so lets send them a notice about this parcel
+                    //They are not allowed in this parcel, but not banned, so lets send them a notice about this parcel
-                    return true;
+                    return true;
-                }
+                }
-            }
+            }
-            return false;
+            return false;
-        }
+        }
-        public void sendLandUpdateToClient(IClientAPI remote_client)
+        public void sendLandUpdateToClient(IClientAPI remote_client)
-        {
+        {
-            sendLandProperties(0, false, 0, remote_client);
+            sendLandProperties(0, false, 0, remote_client);
-        }
+        }
-        public void sendLandUpdateToAvatarsOverMe()
+        public void sendLandUpdateToAvatarsOverMe()
-        {
+        {
-            List<ScenePresence> avatars = m_scene.GetAvatars();
+            List<ScenePresence> avatars = m_scene.GetAvatars();
-            ILandObject over = null;
+            ILandObject over = null;
-            for (int i = 0; i < avatars.Count; i++)
+            for (int i = 0; i < avatars.Count; i++)
-            {
+            {
-                try
+                try
-                {
+                {
-                    over =
+                    over =
-                        m_scene.LandChannel.getLandObject((int) Math.Max(255, Math.Min(0, Math.Round(avatars[i].AbsolutePosition.X))),
+                        m_scene.LandChannel.getLandObject((int) Math.Max(255, Math.Min(0, Math.Round(avatars[i].AbsolutePosition.X))),
-                                                          (int) Math.Max(255, Math.Min(0, Math.Round(avatars[i].AbsolutePosition.Y))));
+                                                          (int) Math.Max(255, Math.Min(0, Math.Round(avatars[i].AbsolutePosition.Y))));
-                }
+                }
-                catch (Exception)
+                catch (Exception)
-                {
+                {
-                    m_log.Warn("[LAND]: " + "unable to get land at x: " + Math.Round(avatars[i].AbsolutePosition.X) + " y: " +
+                    m_log.Warn("[LAND]: " + "unable to get land at x: " + Math.Round(avatars[i].AbsolutePosition.X) + " y: " +
-                               Math.Round(avatars[i].AbsolutePosition.Y));
+                               Math.Round(avatars[i].AbsolutePosition.Y));
-                }
+                }
-                if (over != null)
+                if (over != null)
-                {
+                {
-                    if (over.landData.localID == landData.localID)
+                    if (over.landData.localID == landData.localID)
-                    {
+                    {
-                        sendLandUpdateToClient(avatars[i].ControllingClient);
+                        sendLandUpdateToClient(avatars[i].ControllingClient);
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        #endregion
+        #endregion
-        #region AccessList Functions
+        #region AccessList Functions
-        public ParcelAccessListReplyPacket.ListBlock[] createAccessListArrayByFlag(ParcelManager.AccessList flag)
+        public ParcelAccessListReplyPacket.ListBlock[] createAccessListArrayByFlag(ParcelManager.AccessList flag)
-        {
+        {
-            List<ParcelAccessListReplyPacket.ListBlock> list = new List<ParcelAccessListReplyPacket.ListBlock>();
+            List<ParcelAccessListReplyPacket.ListBlock> list = new List<ParcelAccessListReplyPacket.ListBlock>();
-            foreach (ParcelManager.ParcelAccessEntry entry in landData.parcelAccessList)
+            foreach (ParcelManager.ParcelAccessEntry entry in landData.parcelAccessList)
-            {
+            {
-                if (entry.Flags == flag)
+                if (entry.Flags == flag)
-                {
+                {
-                    ParcelAccessListReplyPacket.ListBlock listBlock = new ParcelAccessListReplyPacket.ListBlock();
+                    ParcelAccessListReplyPacket.ListBlock listBlock = new ParcelAccessListReplyPacket.ListBlock();
-                    listBlock.Flags = (uint) 0;
+                    listBlock.Flags = (uint) 0;
-                    listBlock.ID = entry.AgentID;
+                    listBlock.ID = entry.AgentID;
-                    listBlock.Time = 0;
+                    listBlock.Time = 0;
-                    list.Add(listBlock);
+                    list.Add(listBlock);
-                }
+                }
-            }
+            }
-            if (list.Count == 0)
+            if (list.Count == 0)
-            {
+            {
-                ParcelAccessListReplyPacket.ListBlock listBlock = new ParcelAccessListReplyPacket.ListBlock();
+                ParcelAccessListReplyPacket.ListBlock listBlock = new ParcelAccessListReplyPacket.ListBlock();
-                listBlock.Flags = (uint) 0;
+                listBlock.Flags = (uint) 0;
-                listBlock.ID = LLUUID.Zero;
+                listBlock.ID = LLUUID.Zero;
-                listBlock.Time = 0;
+                listBlock.Time = 0;
-                list.Add(listBlock);
+                list.Add(listBlock);
-            }
+            }
-            return list.ToArray();
+            return list.ToArray();
-        }
+        }
-        public void sendAccessList(LLUUID agentID, LLUUID sessionID, uint flags, int sequenceID,
+        public void sendAccessList(LLUUID agentID, LLUUID sessionID, uint flags, int sequenceID,
-                                   IClientAPI remote_client)
+                                   IClientAPI remote_client)
-        {
+        {
-            ParcelAccessListReplyPacket replyPacket;
+            ParcelAccessListReplyPacket replyPacket;
-            if (flags == (uint) ParcelManager.AccessList.Access || flags == (uint) ParcelManager.AccessList.Both)
+            if (flags == (uint) ParcelManager.AccessList.Access || flags == (uint) ParcelManager.AccessList.Both)
-            {
+            {
-                replyPacket = (ParcelAccessListReplyPacket) PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply);
+                replyPacket = (ParcelAccessListReplyPacket) PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply);
-                replyPacket.Data.AgentID = agentID;
+                replyPacket.Data.AgentID = agentID;
-                replyPacket.Data.Flags = (uint) ParcelManager.AccessList.Access;
+                replyPacket.Data.Flags = (uint) ParcelManager.AccessList.Access;
-                replyPacket.Data.LocalID = landData.localID;
+                replyPacket.Data.LocalID = landData.localID;
-                replyPacket.Data.SequenceID = 0;
+                replyPacket.Data.SequenceID = 0;
-                replyPacket.List = createAccessListArrayByFlag(ParcelManager.AccessList.Access);
+                replyPacket.List = createAccessListArrayByFlag(ParcelManager.AccessList.Access);
-                remote_client.OutPacket((Packet) replyPacket, ThrottleOutPacketType.Task);
+                remote_client.OutPacket((Packet) replyPacket, ThrottleOutPacketType.Task);
-            }
+            }
-            if (flags == (uint) ParcelManager.AccessList.Ban || flags == (uint) ParcelManager.AccessList.Both)
+            if (flags == (uint) ParcelManager.AccessList.Ban || flags == (uint) ParcelManager.AccessList.Both)
-            {
+            {
-                replyPacket = (ParcelAccessListReplyPacket) PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply);
+                replyPacket = (ParcelAccessListReplyPacket) PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply);
-                replyPacket.Data.AgentID = agentID;
+                replyPacket.Data.AgentID = agentID;
-                replyPacket.Data.Flags = (uint) ParcelManager.AccessList.Ban;
+                replyPacket.Data.Flags = (uint) ParcelManager.AccessList.Ban;
-                replyPacket.Data.LocalID = landData.localID;
+                replyPacket.Data.LocalID = landData.localID;
-                replyPacket.Data.SequenceID = 0;
+                replyPacket.Data.SequenceID = 0;
-                replyPacket.List = createAccessListArrayByFlag(ParcelManager.AccessList.Ban);
+                replyPacket.List = createAccessListArrayByFlag(ParcelManager.AccessList.Ban);
-                remote_client.OutPacket((Packet) replyPacket, ThrottleOutPacketType.Task);
+                remote_client.OutPacket((Packet) replyPacket, ThrottleOutPacketType.Task);
-            }
+            }
-        }
+        }
-        public void updateAccessList(uint flags, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client)
+        public void updateAccessList(uint flags, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client)
-        {
+        {
-            LandData newData = landData.Copy();
+            LandData newData = landData.Copy();
-            if (entries.Count == 1 && entries[0].AgentID == LLUUID.Zero)
+            if (entries.Count == 1 && entries[0].AgentID == LLUUID.Zero)
-            {
+            {
-                entries.Clear();
+                entries.Clear();
-            }
+            }
-            List<ParcelManager.ParcelAccessEntry> toRemove = new List<ParcelManager.ParcelAccessEntry>();
+            List<ParcelManager.ParcelAccessEntry> toRemove = new List<ParcelManager.ParcelAccessEntry>();
-            foreach (ParcelManager.ParcelAccessEntry entry in newData.parcelAccessList)
+            foreach (ParcelManager.ParcelAccessEntry entry in newData.parcelAccessList)
-            {
+            {
-                if (entry.Flags == (ParcelManager.AccessList) flags)
+                if (entry.Flags == (ParcelManager.AccessList) flags)
-                {
+                {
-                    toRemove.Add(entry);
+                    toRemove.Add(entry);
-                }
+                }
-            }
+            }
-            foreach (ParcelManager.ParcelAccessEntry entry in toRemove)
+            foreach (ParcelManager.ParcelAccessEntry entry in toRemove)
-            {
+            {
-                newData.parcelAccessList.Remove(entry);
+                newData.parcelAccessList.Remove(entry);
-            }
+            }
-            foreach (ParcelManager.ParcelAccessEntry entry in entries)
+            foreach (ParcelManager.ParcelAccessEntry entry in entries)
-            {
+            {
-                ParcelManager.ParcelAccessEntry temp = new ParcelManager.ParcelAccessEntry();
+                ParcelManager.ParcelAccessEntry temp = new ParcelManager.ParcelAccessEntry();
-                temp.AgentID = entry.AgentID;
+                temp.AgentID = entry.AgentID;
-                temp.Time = new DateTime(); //Pointless? Yes.
+                temp.Time = new DateTime(); //Pointless? Yes.
-                temp.Flags = (ParcelManager.AccessList) flags;
+                temp.Flags = (ParcelManager.AccessList) flags;
-                if (!newData.parcelAccessList.Contains(temp))
+                if (!newData.parcelAccessList.Contains(temp))
-                {
+                {
-                    newData.parcelAccessList.Add(temp);
+                    newData.parcelAccessList.Add(temp);
-                }
+                }
-            }
+            }
-            m_scene.LandChannel.updateLandObject(landData.localID, newData);
+            m_scene.LandChannel.updateLandObject(landData.localID, newData);
-        }
+        }
-        #endregion
+        #endregion
-        #region Update Functions
+        #region Update Functions
-        public void updateLandBitmapByteArray()
+        public void updateLandBitmapByteArray()
-        {
+        {
-            landData.landBitmapByteArray = convertLandBitmapToBytes();
+            landData.landBitmapByteArray = convertLandBitmapToBytes();
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Update all settings in land such as area, bitmap byte array, etc
+        /// Update all settings in land such as area, bitmap byte array, etc
-        /// </summary>
+        /// </summary>
-        public void forceUpdateLandInfo()
+        public void forceUpdateLandInfo()
-        {
+        {
-            updateAABBAndAreaValues();
+            updateAABBAndAreaValues();
-            updateLandBitmapByteArray();
+            updateLandBitmapByteArray();
-        }
+        }
-        public void setLandBitmapFromByteArray()
+        public void setLandBitmapFromByteArray()
-        {
+        {
-            landBitmap = convertBytesToLandBitmap();
+            landBitmap = convertBytesToLandBitmap();
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Updates the AABBMin and AABBMax values after area/shape modification of the land object
+        /// Updates the AABBMin and AABBMax values after area/shape modification of the land object
-        /// </summary>
+        /// </summary>
-        private void updateAABBAndAreaValues()
+        private void updateAABBAndAreaValues()
-        {
+        {
-            int min_x = 64;
+            int min_x = 64;
-            int min_y = 64;
+            int min_y = 64;
-            int max_x = 0;
+            int max_x = 0;
-            int max_y = 0;
+            int max_y = 0;
-            int tempArea = 0;
+            int tempArea = 0;
-            int x, y;
+            int x, y;
-            for (x = 0; x < 64; x++)
+            for (x = 0; x < 64; x++)
-            {
+            {
-                for (y = 0; y < 64; y++)
+                for (y = 0; y < 64; y++)
-                {
+                {
-                    if (landBitmap[x, y] == true)
+                    if (landBitmap[x, y] == true)
-                    {
+                    {
-                        if (min_x > x) min_x = x;
+                        if (min_x > x) min_x = x;
-                        if (min_y > y) min_y = y;
+                        if (min_y > y) min_y = y;
-                        if (max_x < x) max_x = x;
+                        if (max_x < x) max_x = x;
-                        if (max_y < y) max_y = y;
+                        if (max_y < y) max_y = y;
-                        tempArea += 16; //16sqm peice of land
+                        tempArea += 16; //16sqm peice of land
-                    }
+                    }
-                }
+                }
-            }
+            }
-            int tx = min_x * 4;
+            int tx = min_x * 4;
-            if (tx > 255)
+            if (tx > 255)
-                tx = 255;
+                tx = 255;
-            int ty = min_y * 4;
+            int ty = min_y * 4;
-            if (ty > 255)
+            if (ty > 255)
-                ty = 255;
+                ty = 255;
-            landData.AABBMin =
+            landData.AABBMin =
-                new LLVector3((float) (min_x * 4), (float) (min_y * 4),
+                new LLVector3((float) (min_x * 4), (float) (min_y * 4),
-                              (float) m_scene.Heightmap[tx, ty]);
+                              (float) m_scene.Heightmap[tx, ty]);
-            tx = max_x * 4;
+            tx = max_x * 4;
-            if (tx > 255)
+            if (tx > 255)
-                tx = 255;
+                tx = 255;
-            ty = max_y * 4;
+            ty = max_y * 4;
-            if (ty > 255)
+            if (ty > 255)
-                ty = 255;
+                ty = 255;
-            landData.AABBMax =
+            landData.AABBMax =
-                new LLVector3((float) (max_x * 4), (float) (max_y * 4),
+                new LLVector3((float) (max_x * 4), (float) (max_y * 4),
-                              (float) m_scene.Heightmap[tx, ty]);
+                              (float) m_scene.Heightmap[tx, ty]);
-            landData.area = tempArea;
+            landData.area = tempArea;
-        }
+        }
-        #endregion
+        #endregion
-        #region Land Bitmap Functions
+        #region Land Bitmap Functions
-        /// <summary>
+        /// <summary>
-        /// Sets the land's bitmap manually
+        /// Sets the land's bitmap manually
-        /// </summary>
+        /// </summary>
-        /// <param name="bitmap">64x64 block representing where this land is on a map</param>
+        /// <param name="bitmap">64x64 block representing where this land is on a map</param>
-        public void setLandBitmap(bool[,] bitmap)
+        public void setLandBitmap(bool[,] bitmap)
-        {
+        {
-            if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2)
+            if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2)
-            {
+            {
-                //Throw an exception - The bitmap is not 64x64
+                //Throw an exception - The bitmap is not 64x64
-                //throw new Exception("Error: Invalid Parcel Bitmap");
+                //throw new Exception("Error: Invalid Parcel Bitmap");
-            }
+            }
-            else
+            else
-            {
+            {
-                //Valid: Lets set it
+                //Valid: Lets set it
-                landBitmap = bitmap;
+                landBitmap = bitmap;
-                forceUpdateLandInfo();
+                forceUpdateLandInfo();
-            }
+            }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Gets the land's bitmap manually
+        /// Gets the land's bitmap manually
-        /// </summary>
+        /// </summary>
-        /// <returns></returns>
+        /// <returns></returns>
-        public bool[,] getLandBitmap()
+        public bool[,] getLandBitmap()
-        {
+        {
-            return landBitmap;
+            return landBitmap;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Full sim land object creation
+        /// Full sim land object creation
-        /// </summary>
+        /// </summary>
-        /// <returns></returns>
+        /// <returns></returns>
-        public bool[,] basicFullRegionLandBitmap()
+        public bool[,] basicFullRegionLandBitmap()
-        {
+        {
-            return getSquareLandBitmap(0, 0, (int) Constants.RegionSize, (int) Constants.RegionSize);
+            return getSquareLandBitmap(0, 0, (int) Constants.RegionSize, (int) Constants.RegionSize);
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Used to modify the bitmap between the x and y points. Points use 64 scale
+        /// Used to modify the bitmap between the x and y points. Points use 64 scale
-        /// </summary>
+        /// </summary>
-        /// <param name="start_x"></param>
+        /// <param name="start_x"></param>
-        /// <param name="start_y"></param>
+        /// <param name="start_y"></param>
-        /// <param name="end_x"></param>
+        /// <param name="end_x"></param>
-        /// <param name="end_y"></param>
+        /// <param name="end_y"></param>
-        /// <returns></returns>
+        /// <returns></returns>
-        public bool[,] getSquareLandBitmap(int start_x, int start_y, int end_x, int end_y)
+        public bool[,] getSquareLandBitmap(int start_x, int start_y, int end_x, int end_y)
-        {
+        {
-            bool[,] tempBitmap = new bool[64,64];
+            bool[,] tempBitmap = new bool[64,64];
-            tempBitmap.Initialize();
+            tempBitmap.Initialize();
-            tempBitmap = modifyLandBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);
+            tempBitmap = modifyLandBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);
-            return tempBitmap;
+            return tempBitmap;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Change a land bitmap at within a square and set those points to a specific value
+        /// Change a land bitmap at within a square and set those points to a specific value
-        /// </summary>
+        /// </summary>
-        /// <param name="land_bitmap"></param>
+        /// <param name="land_bitmap"></param>
-        /// <param name="start_x"></param>
+        /// <param name="start_x"></param>
-        /// <param name="start_y"></param>
+        /// <param name="start_y"></param>
-        /// <param name="end_x"></param>
+        /// <param name="end_x"></param>
-        /// <param name="end_y"></param>
+        /// <param name="end_y"></param>
-        /// <param name="set_value"></param>
+        /// <param name="set_value"></param>
-        /// <returns></returns>
+        /// <returns></returns>
-        public bool[,] modifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y,
+        public bool[,] modifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y,
-                                              bool set_value)
+                                              bool set_value)
-        {
+        {
-            if (land_bitmap.GetLength(0) != 64 || land_bitmap.GetLength(1) != 64 || land_bitmap.Rank != 2)
+            if (land_bitmap.GetLength(0) != 64 || land_bitmap.GetLength(1) != 64 || land_bitmap.Rank != 2)
-            {
+            {
-                //Throw an exception - The bitmap is not 64x64
+                //Throw an exception - The bitmap is not 64x64
-                //throw new Exception("Error: Invalid Parcel Bitmap in modifyLandBitmapSquare()");
+                //throw new Exception("Error: Invalid Parcel Bitmap in modifyLandBitmapSquare()");
-            }
+            }
-            int x, y;
+            int x, y;
-            for (y = 0; y < 64; y++)
+            for (y = 0; y < 64; y++)
-            {
+            {
-                for (x = 0; x < 64; x++)
+                for (x = 0; x < 64; x++)
-                {
+                {
-                    if (x >= start_x / 4 && x < end_x / 4
+                    if (x >= start_x / 4 && x < end_x / 4
-                        && y >= start_y / 4 && y < end_y / 4)
+                        && y >= start_y / 4 && y < end_y / 4)
-                    {
+                    {
-                        land_bitmap[x, y] = set_value;
+                        land_bitmap[x, y] = set_value;
-                    }
+                    }
-                }
+                }
-            }
+            }
-            return land_bitmap;
+            return land_bitmap;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Join the true values of 2 bitmaps together
+        /// Join the true values of 2 bitmaps together
-        /// </summary>
+        /// </summary>
-        /// <param name="bitmap_base"></param>
+        /// <param name="bitmap_base"></param>
-        /// <param name="bitmap_add"></param>
+        /// <param name="bitmap_add"></param>
-        /// <returns></returns>
+        /// <returns></returns>
-        public bool[,] mergeLandBitmaps(bool[,] bitmap_base, bool[,] bitmap_add)
+        public bool[,] mergeLandBitmaps(bool[,] bitmap_base, bool[,] bitmap_add)
-        {
+        {
-            if (bitmap_base.GetLength(0) != 64 || bitmap_base.GetLength(1) != 64 || bitmap_base.Rank != 2)
+            if (bitmap_base.GetLength(0) != 64 || bitmap_base.GetLength(1) != 64 || bitmap_base.Rank != 2)
-            {
+            {
-                //Throw an exception - The bitmap is not 64x64
+                //Throw an exception - The bitmap is not 64x64
-                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_base in mergeLandBitmaps");
+                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_base in mergeLandBitmaps");
-            }
+            }
-            if (bitmap_add.GetLength(0) != 64 || bitmap_add.GetLength(1) != 64 || bitmap_add.Rank != 2)
+            if (bitmap_add.GetLength(0) != 64 || bitmap_add.GetLength(1) != 64 || bitmap_add.Rank != 2)
-            {
+            {
-                //Throw an exception - The bitmap is not 64x64
+                //Throw an exception - The bitmap is not 64x64
-                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_add in mergeLandBitmaps");
+                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_add in mergeLandBitmaps");
-            }
+            }
-            int x, y;
+            int x, y;
-            for (y = 0; y < 64; y++)
+            for (y = 0; y < 64; y++)
-            {
+            {
-                for (x = 0; x < 64; x++)
+                for (x = 0; x < 64; x++)
-                {
+                {
-                    if (bitmap_add[x, y])
+                    if (bitmap_add[x, y])
-                    {
+                    {
-                        bitmap_base[x, y] = true;
+                        bitmap_base[x, y] = true;
-                    }
+                    }
-                }
+                }
-            }
+            }
-            return bitmap_base;
+            return bitmap_base;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Converts the land bitmap to a packet friendly byte array
+        /// Converts the land bitmap to a packet friendly byte array
-        /// </summary>
+        /// </summary>
-        /// <returns></returns>
+        /// <returns></returns>
-        private byte[] convertLandBitmapToBytes()
+        private byte[] convertLandBitmapToBytes()
-        {
+        {
-            byte[] tempConvertArr = new byte[512];
+            byte[] tempConvertArr = new byte[512];
-            byte tempByte = 0;
+            byte tempByte = 0;
-            int x, y, i, byteNum = 0;
+            int x, y, i, byteNum = 0;
-            i = 0;
+            i = 0;
-            for (y = 0; y < 64; y++)
+            for (y = 0; y < 64; y++)
-            {
+            {
-                for (x = 0; x < 64; x++)
+                for (x = 0; x < 64; x++)
-                {
+                {
-                    tempByte = Convert.ToByte(tempByte | Convert.ToByte(landBitmap[x, y]) << (i++ % 8));
+                    tempByte = Convert.ToByte(tempByte | Convert.ToByte(landBitmap[x, y]) << (i++ % 8));
-                    if (i % 8 == 0)
+                    if (i % 8 == 0)
-                    {
+                    {
-                        tempConvertArr[byteNum] = tempByte;
+                        tempConvertArr[byteNum] = tempByte;
-                        tempByte = (byte) 0;
+                        tempByte = (byte) 0;
-                        i = 0;
+                        i = 0;
-                        byteNum++;
+                        byteNum++;
-                    }
+                    }
-                }
+                }
-            }
+            }
-            return tempConvertArr;
+            return tempConvertArr;
-        }
+        }
-        private bool[,] convertBytesToLandBitmap()
+        private bool[,] convertBytesToLandBitmap()
-        {
+        {
-            bool[,] tempConvertMap = new bool[64,64];
+            bool[,] tempConvertMap = new bool[64,64];
-            tempConvertMap.Initialize();
+            tempConvertMap.Initialize();
-            byte tempByte = 0;
+            byte tempByte = 0;
-            int x = 0, y = 0, i = 0, bitNum = 0;
+            int x = 0, y = 0, i = 0, bitNum = 0;
-            for (i = 0; i < 512; i++)
+            for (i = 0; i < 512; i++)
-            {
+            {
-                tempByte = landData.landBitmapByteArray[i];
+                tempByte = landData.landBitmapByteArray[i];
-                for (bitNum = 0; bitNum < 8; bitNum++)
+                for (bitNum = 0; bitNum < 8; bitNum++)
-                {
+                {
-                    bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte) 1);
+                    bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte) 1);
-                    tempConvertMap[x, y] = bit;
+                    tempConvertMap[x, y] = bit;
-                    x++;
+                    x++;
-                    if (x > 63)
+                    if (x > 63)
-                    {
+                    {
-                        x = 0;
+                        x = 0;
-                        y++;
+                        y++;
-                    }
+                    }
-                }
+                }
-            }
+            }
-            return tempConvertMap;
+            return tempConvertMap;
-        }
+        }
-        #endregion
+        #endregion
-        #region Object Select and Object Owner Listing
+        #region Object Select and Object Owner Listing
-        public void sendForceObjectSelect(int local_id, int request_type, IClientAPI remote_client)
+        public void sendForceObjectSelect(int local_id, int request_type, IClientAPI remote_client)
-        {
+        {
-            List<uint> resultLocalIDs = new List<uint>();
+            List<uint> resultLocalIDs = new List<uint>();
-            foreach (SceneObjectGroup obj in primsOverMe)
+            foreach (SceneObjectGroup obj in primsOverMe)
-            {
+            {
-                if (obj.LocalId > 0)
+                if (obj.LocalId > 0)
-                {
+                {
-                    if (request_type == LandChannel.LAND_SELECT_OBJECTS_OWNER && obj.OwnerID == landData.ownerID)
+                    if (request_type == LandChannel.LAND_SELECT_OBJECTS_OWNER && obj.OwnerID == landData.ownerID)
-                    {
+                    {
-                        resultLocalIDs.Add(obj.LocalId);
+                        resultLocalIDs.Add(obj.LocalId);
-                    }
+                    }
-                        // else if (request_type == LandManager.LAND_SELECT_OBJECTS_GROUP && ...) // TODO: group support
+                        // else if (request_type == LandManager.LAND_SELECT_OBJECTS_GROUP && ...) // TODO: group support
-                        // {
+                        // {
-                        // }
+                        // }
-                    else if (request_type == LandChannel.LAND_SELECT_OBJECTS_OTHER &&
+                    else if (request_type == LandChannel.LAND_SELECT_OBJECTS_OTHER &&
-                             obj.OwnerID != remote_client.AgentId)
+                             obj.OwnerID != remote_client.AgentId)
-                    {
+                    {
-                        resultLocalIDs.Add(obj.LocalId);
+                        resultLocalIDs.Add(obj.LocalId);
-                    }
+                    }
-                }
+                }
-            }
+            }
-            bool firstCall = true;
+            bool firstCall = true;
-            int MAX_OBJECTS_PER_PACKET = 251;
+            int MAX_OBJECTS_PER_PACKET = 251;
-            ForceObjectSelectPacket pack = (ForceObjectSelectPacket) PacketPool.Instance.GetPacket(PacketType.ForceObjectSelect);
+            ForceObjectSelectPacket pack = (ForceObjectSelectPacket) PacketPool.Instance.GetPacket(PacketType.ForceObjectSelect);
-            // TODO: don't create new blocks if recycling an old packet
+            // TODO: don't create new blocks if recycling an old packet
-            ForceObjectSelectPacket.DataBlock[] data;
+            ForceObjectSelectPacket.DataBlock[] data;
-            while (resultLocalIDs.Count > 0)
+            while (resultLocalIDs.Count > 0)
-            {
+            {
-                if (firstCall)
+                if (firstCall)
-                {
+                {
-                    pack._Header.ResetList = true;
+                    pack._Header.ResetList = true;
-                    firstCall = false;
+                    firstCall = false;
-                }
+                }
-                else
+                else
-                {
+                {
-                    pack._Header.ResetList = false;
+                    pack._Header.ResetList = false;
-                }
+                }
-                if (resultLocalIDs.Count > MAX_OBJECTS_PER_PACKET)
+                if (resultLocalIDs.Count > MAX_OBJECTS_PER_PACKET)
-                {
+                {
-                    data = new ForceObjectSelectPacket.DataBlock[MAX_OBJECTS_PER_PACKET];
+                    data = new ForceObjectSelectPacket.DataBlock[MAX_OBJECTS_PER_PACKET];
-                }
+                }
-                else
+                else
-                {
+                {
-                    data = new ForceObjectSelectPacket.DataBlock[resultLocalIDs.Count];
+                    data = new ForceObjectSelectPacket.DataBlock[resultLocalIDs.Count];
-                }
+                }
-                int i;
+                int i;
-                for (i = 0; i < MAX_OBJECTS_PER_PACKET && resultLocalIDs.Count > 0; i++)
+                for (i = 0; i < MAX_OBJECTS_PER_PACKET && resultLocalIDs.Count > 0; i++)
-                {
+                {
-                    data[i] = new ForceObjectSelectPacket.DataBlock();
+                    data[i] = new ForceObjectSelectPacket.DataBlock();
-                    data[i].LocalID = Convert.ToUInt32(resultLocalIDs[0]);
+                    data[i].LocalID = Convert.ToUInt32(resultLocalIDs[0]);
-                    resultLocalIDs.RemoveAt(0);
+                    resultLocalIDs.RemoveAt(0);
-                }
+                }
-                pack.Data = data;
+                pack.Data = data;
-                remote_client.OutPacket((Packet) pack, ThrottleOutPacketType.Task);
+                remote_client.OutPacket((Packet) pack, ThrottleOutPacketType.Task);
-            }
+            }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Notify the parcel owner each avatar that owns prims situated on their land.  This notification includes
+        /// Notify the parcel owner each avatar that owns prims situated on their land.  This notification includes
-        /// aggreagete details such as the number of prims.
+        /// aggreagete details such as the number of prims.
-        ///  
+        ///  
-        /// </summary>
+        /// </summary>
-        /// <param name="remote_client">
+        /// <param name="remote_client">
-        /// A <see cref="IClientAPI"/>
+        /// A <see cref="IClientAPI"/>
-        /// </param>
+        /// </param>
-        public void sendLandObjectOwners(IClientAPI remote_client)
+        public void sendLandObjectOwners(IClientAPI remote_client)
-        {
+        {
-            Dictionary<LLUUID, int> primCount = new Dictionary<LLUUID, int>();
+            Dictionary<LLUUID, int> primCount = new Dictionary<LLUUID, int>();
-            ParcelObjectOwnersReplyPacket pack
+            ParcelObjectOwnersReplyPacket pack
-                = (ParcelObjectOwnersReplyPacket) PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply);
+                = (ParcelObjectOwnersReplyPacket) PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply);
-            // TODO: don't create new blocks if recycling an old packet
+            // TODO: don't create new blocks if recycling an old packet
-            foreach (SceneObjectGroup obj in primsOverMe)
+            foreach (SceneObjectGroup obj in primsOverMe)
-            {
+            {
-                try
+                try
-                {
+                {
-                    if (!primCount.ContainsKey(obj.OwnerID))
+                    if (!primCount.ContainsKey(obj.OwnerID))
-                    {
+                    {
-                        primCount.Add(obj.OwnerID, 0);
+                        primCount.Add(obj.OwnerID, 0);
-                    }
+                    }
-                }
+                }
-                catch (NullReferenceException)
+                catch (NullReferenceException)
-                {
+                {
-                    m_log.Info("[LAND]: " + "Got Null Reference when searching land owners from the parcel panel");
+                    m_log.Info("[LAND]: " + "Got Null Reference when searching land owners from the parcel panel");
-                }
+                }
-                try
+                try
-                {
+                {
-                    primCount[obj.OwnerID] += obj.PrimCount;
+                    primCount[obj.OwnerID] += obj.PrimCount;
-                }
+                }
-                catch (KeyNotFoundException)
+                catch (KeyNotFoundException)
-                {
+                {
-                    m_log.Error("[LAND]: Unable to match a prim with it's owner.");
+                    m_log.Error("[LAND]: Unable to match a prim with it's owner.");
-                }
+                }
-            }
+            }
-            int notifyCount = primCount.Count;
+            int notifyCount = primCount.Count;
-            if (notifyCount > 0)
+            if (notifyCount > 0)
-            {
+            {
-                if (notifyCount > 32)
+                if (notifyCount > 32)
-                {
+                {
-                    m_log.InfoFormat(
+                    m_log.InfoFormat(
-                        "[LAND]: More than {0} avatars own prims on this parcel.  Only sending back details of first {0}"
+                        "[LAND]: More than {0} avatars own prims on this parcel.  Only sending back details of first {0}"
-                        + " - a developer might want to investigate whether this is a hard limit", 32);
+                        + " - a developer might want to investigate whether this is a hard limit", 32);
-                    notifyCount = 32;
+                    notifyCount = 32;
-                }
+                }
-                ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock
+                ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock
-                    = new ParcelObjectOwnersReplyPacket.DataBlock[notifyCount];
+                    = new ParcelObjectOwnersReplyPacket.DataBlock[notifyCount];
-                int num = 0;
+                int num = 0;
-                foreach (LLUUID owner in primCount.Keys)
+                foreach (LLUUID owner in primCount.Keys)
-                {
+                {
-                    dataBlock[num] = new ParcelObjectOwnersReplyPacket.DataBlock();
+                    dataBlock[num] = new ParcelObjectOwnersReplyPacket.DataBlock();
-                    dataBlock[num].Count = primCount[owner];
+                    dataBlock[num].Count = primCount[owner];
-                    dataBlock[num].IsGroupOwned = false; //TODO: fix me when group support is added
+                    dataBlock[num].IsGroupOwned = false; //TODO: fix me when group support is added
-                    dataBlock[num].OnlineStatus = true; //TODO: fix me later
+                    dataBlock[num].OnlineStatus = true; //TODO: fix me later
-                    dataBlock[num].OwnerID = owner;
+                    dataBlock[num].OwnerID = owner;
-                    num++;
+                    num++;
-                    if (num >= notifyCount)
+                    if (num >= notifyCount)
-                    {
+                    {
-                        break;
+                        break;
-                    }
+                    }
-                }
+                }
-                pack.Data = dataBlock;
+                pack.Data = dataBlock;
-            }
+            }
-            remote_client.OutPacket(pack, ThrottleOutPacketType.Task);
+            remote_client.OutPacket(pack, ThrottleOutPacketType.Task);
-        }
+        }
-        public Dictionary<LLUUID, int> getLandObjectOwners()
+        public Dictionary<LLUUID, int> getLandObjectOwners()
-        {
+        {
-            Dictionary<LLUUID, int> ownersAndCount = new Dictionary<LLUUID, int>();
+            Dictionary<LLUUID, int> ownersAndCount = new Dictionary<LLUUID, int>();
-            foreach (SceneObjectGroup obj in primsOverMe)
+            foreach (SceneObjectGroup obj in primsOverMe)
-            {
+            {
-                if (!ownersAndCount.ContainsKey(obj.OwnerID))
+                if (!ownersAndCount.ContainsKey(obj.OwnerID))
-                {
+                {
-                    ownersAndCount.Add(obj.OwnerID, 0);
+                    ownersAndCount.Add(obj.OwnerID, 0);
-                }
+                }
-                ownersAndCount[obj.OwnerID] += obj.PrimCount;
+                ownersAndCount[obj.OwnerID] += obj.PrimCount;
-            }
+            }
-            return ownersAndCount;
+            return ownersAndCount;
-        }
+        }
-        #endregion
+        #endregion
-        #region Object Returning
+        #region Object Returning
-        public void returnObject(SceneObjectGroup obj)
+        public void returnObject(SceneObjectGroup obj)
-        {
+        {
-        }
+        }
-        public void returnLandObjects(int type, LLUUID owner)
+        public void returnLandObjects(int type, LLUUID owner)
-        {
+        {
-        }
+        }
-        #endregion
+        #endregion
-        #region Object Adding/Removing from Parcel
+        #region Object Adding/Removing from Parcel
-        public void resetLandPrimCounts()
+        public void resetLandPrimCounts()
-        {
+        {
-            landData.groupPrims = 0;
+            landData.groupPrims = 0;
-            landData.ownerPrims = 0;
+            landData.ownerPrims = 0;
-            landData.otherPrims = 0;
+            landData.otherPrims = 0;
-            landData.selectedPrims = 0;
+            landData.selectedPrims = 0;
-            primsOverMe.Clear();
+            primsOverMe.Clear();
-        }
+        }
-        public void addPrimToCount(SceneObjectGroup obj)
+        public void addPrimToCount(SceneObjectGroup obj)
-        {
+        {
-            LLUUID prim_owner = obj.OwnerID;
+            LLUUID prim_owner = obj.OwnerID;
-            int prim_count = obj.PrimCount;
+            int prim_count = obj.PrimCount;
-            if (obj.IsSelected)
+            if (obj.IsSelected)
-            {
+            {
-                landData.selectedPrims += prim_count;
+                landData.selectedPrims += prim_count;
-            }
+            }
-            else
+            else
-            {
+            {
-                if (prim_owner == landData.ownerID)
+                if (prim_owner == landData.ownerID)
-                {
+                {
-                    landData.ownerPrims += prim_count;
+                    landData.ownerPrims += prim_count;
-                }
+                }
-                else
+                else
-                {
+                {
-                    landData.otherPrims += prim_count;
+                    landData.otherPrims += prim_count;
-                }
+                }
-            }
+            }
-            primsOverMe.Add(obj);
+            primsOverMe.Add(obj);
-        }
+        }
-        public void removePrimFromCount(SceneObjectGroup obj)
+        public void removePrimFromCount(SceneObjectGroup obj)
-        {
+        {
-            if (primsOverMe.Contains(obj))
+            if (primsOverMe.Contains(obj))
-            {
+            {
-                LLUUID prim_owner = obj.OwnerID;
+                LLUUID prim_owner = obj.OwnerID;
-                int prim_count = obj.PrimCount;
+                int prim_count = obj.PrimCount;
-                if (prim_owner == landData.ownerID)
+                if (prim_owner == landData.ownerID)
-                {
+                {
-                    landData.ownerPrims -= prim_count;
+                    landData.ownerPrims -= prim_count;
-                }
+                }
-                else if (prim_owner == landData.groupID)
+                else if (prim_owner == landData.groupID)
-                {
+                {
-                    landData.groupPrims -= prim_count;
+                    landData.groupPrims -= prim_count;
-                }
+                }
-                else
+                else
-                {
+                {
-                    landData.otherPrims -= prim_count;
+                    landData.otherPrims -= prim_count;
-                }
+                }
-                primsOverMe.Remove(obj);
+                primsOverMe.Remove(obj);
-            }
+            }
-        }
+        }
-        #endregion
+        #endregion
-        #endregion
+        #endregion
-        #endregion
+        #endregion
-    }
+    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs
index fc3f75d..77a418f 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs
@@ -1,36 +1,36 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules.ExportSerialiser
+namespace OpenSim.Region.Environment.Modules.ExportSerialiser
-{
+{
-    internal interface IFileSerialiser
+    internal interface IFileSerialiser
-    {
+    {
-        string WriteToFile(Scene scene, string dir);
+        string WriteToFile(Scene scene, string dir);
-    }
+    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs
index 0ea2f30..e1721ff 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs
@@ -1,37 +1,37 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System.Collections.Generic;
+using System.Collections.Generic;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules.ExportSerialiser
+namespace OpenSim.Region.Environment.Modules.ExportSerialiser
-{
+{
-    public interface IRegionSerialiser
+    public interface IRegionSerialiser
-    {
+    {
-        List<string> SerialiseRegion(Scene scene, string saveDir);
+        List<string> SerialiseRegion(Scene scene, string saveDir);
-    }
+    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs
index ef90fd4..40e1771 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs
@@ -1,125 +1,125 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using System.IO.Compression;
+using System.IO.Compression;
-using System.Text;
+using System.Text;
-using System.Xml;
+using System.Xml;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules.ExportSerialiser
+namespace OpenSim.Region.Environment.Modules.ExportSerialiser
-{
+{
-    internal class SerialiseObjects : IFileSerialiser
+    internal class SerialiseObjects : IFileSerialiser
-    {
+    {
-        #region IFileSerialiser Members
+        #region IFileSerialiser Members
-        public string WriteToFile(Scene scene, string dir)
+        public string WriteToFile(Scene scene, string dir)
-        {
+        {
-            string targetFileName = dir + "objects.xml";
+            string targetFileName = dir + "objects.xml";
-            SaveSerialisedToFile(targetFileName, scene);
+            SaveSerialisedToFile(targetFileName, scene);
-            return "objects.xml";
+            return "objects.xml";
-        }
+        }
-        #endregion
+        #endregion
-        public void SaveSerialisedToFile(string fileName, Scene scene)
+        public void SaveSerialisedToFile(string fileName, Scene scene)
-        {
+        {
-            string xmlstream = GetObjectXml(scene);
+            string xmlstream = GetObjectXml(scene);
-            MemoryStream stream = ReformatXmlString(xmlstream);
+            MemoryStream stream = ReformatXmlString(xmlstream);
-            stream.Seek(0, SeekOrigin.Begin);
+            stream.Seek(0, SeekOrigin.Begin);
-            CreateXmlFile(stream, fileName);
+            CreateXmlFile(stream, fileName);
-            stream.Seek(0, SeekOrigin.Begin);
+            stream.Seek(0, SeekOrigin.Begin);
-            CreateCompressedXmlFile(stream, fileName);
+            CreateCompressedXmlFile(stream, fileName);
-        }
+        }
-        private static MemoryStream ReformatXmlString(string xmlstream)
+        private static MemoryStream ReformatXmlString(string xmlstream)
-        {
+        {
-            MemoryStream stream = new MemoryStream();
+            MemoryStream stream = new MemoryStream();
-            XmlTextWriter formatter = new XmlTextWriter(stream, Encoding.UTF8);
+            XmlTextWriter formatter = new XmlTextWriter(stream, Encoding.UTF8);
-            XmlDocument doc = new XmlDocument();
+            XmlDocument doc = new XmlDocument();
-            doc.LoadXml(xmlstream);
+            doc.LoadXml(xmlstream);
-            formatter.Formatting = Formatting.Indented;
+            formatter.Formatting = Formatting.Indented;
-            doc.WriteContentTo(formatter);
+            doc.WriteContentTo(formatter);
-            formatter.Flush();
+            formatter.Flush();
-            return stream;
+            return stream;
-        }
+        }
-        private static string GetObjectXml(Scene scene)
+        private static string GetObjectXml(Scene scene)
-        {
+        {
-            string xmlstream = "<scene>";
+            string xmlstream = "<scene>";
-            List<EntityBase> EntityList = scene.GetEntities();
+            List<EntityBase> EntityList = scene.GetEntities();
-            List<string> EntityXml = new List<string>();
+            List<string> EntityXml = new List<string>();
-            foreach (EntityBase ent in EntityList)
+            foreach (EntityBase ent in EntityList)
-            {
+            {
-                if (ent is SceneObjectGroup)
+                if (ent is SceneObjectGroup)
-                {
+                {
-                    EntityXml.Add(((SceneObjectGroup) ent).ToXmlString2());
+                    EntityXml.Add(((SceneObjectGroup) ent).ToXmlString2());
-                }
+                }
-            }
+            }
-            EntityXml.Sort();
+            EntityXml.Sort();
-            foreach (string xml in EntityXml)
+            foreach (string xml in EntityXml)
-                xmlstream += xml;
+                xmlstream += xml;
-            xmlstream += "</scene>";
+            xmlstream += "</scene>";
-            return xmlstream;
+            return xmlstream;
-        }
+        }
-        private static void CreateXmlFile(MemoryStream xmlStream, string fileName)
+        private static void CreateXmlFile(MemoryStream xmlStream, string fileName)
-        {
+        {
-            FileStream objectsFile = new FileStream(fileName, FileMode.Create);
+            FileStream objectsFile = new FileStream(fileName, FileMode.Create);
-            xmlStream.WriteTo(objectsFile);
+            xmlStream.WriteTo(objectsFile);
-            objectsFile.Flush();
+            objectsFile.Flush();
-            objectsFile.Close();
+            objectsFile.Close();
-        }
+        }
-        private static void CreateCompressedXmlFile(MemoryStream xmlStream, string fileName)
+        private static void CreateCompressedXmlFile(MemoryStream xmlStream, string fileName)
-        {
+        {
-            #region GZip Compressed Version
+            #region GZip Compressed Version
-            FileStream objectsFileCompressed = new FileStream(fileName + ".gzs", FileMode.Create);
+            FileStream objectsFileCompressed = new FileStream(fileName + ".gzs", FileMode.Create);
-            MemoryStream gzipMSStream = new MemoryStream();
+            MemoryStream gzipMSStream = new MemoryStream();
-            GZipStream gzipStream = new GZipStream(gzipMSStream, CompressionMode.Compress);
+            GZipStream gzipStream = new GZipStream(gzipMSStream, CompressionMode.Compress);
-            xmlStream.WriteTo(gzipStream);
+            xmlStream.WriteTo(gzipStream);
-            gzipMSStream.WriteTo(objectsFileCompressed);
+            gzipMSStream.WriteTo(objectsFileCompressed);
-            objectsFileCompressed.Flush();
+            objectsFileCompressed.Flush();
-            objectsFileCompressed.Close();
+            objectsFileCompressed.Close();
-            #endregion
+            #endregion
-        }
+        }
-    }
+    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs
index 03824e8..dacdbc8 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs
@@ -1,53 +1,53 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenSim.Region.Environment.Modules.World.Terrain;
+using OpenSim.Region.Environment.Modules.World.Terrain;
-using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;
+using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules.ExportSerialiser
+namespace OpenSim.Region.Environment.Modules.ExportSerialiser
-{
+{
-    internal class SerialiseTerrain : IFileSerialiser
+    internal class SerialiseTerrain : IFileSerialiser
-    {
+    {
-        #region IFileSerialiser Members
+        #region IFileSerialiser Members
-        public string WriteToFile(Scene scene, string dir)
+        public string WriteToFile(Scene scene, string dir)
-        {
+        {
-            ITerrainLoader fileSystemExporter = new RAW32();
+            ITerrainLoader fileSystemExporter = new RAW32();
-            string targetFileName = dir + "heightmap.r32";
+            string targetFileName = dir + "heightmap.r32";
-            lock (scene.Heightmap)
+            lock (scene.Heightmap)
-            {
+            {
-                fileSystemExporter.SaveFile(targetFileName, scene.Heightmap);
+                fileSystemExporter.SaveFile(targetFileName, scene.Heightmap);
-            }
+            }
-            return "heightmap.r32";
+            return "heightmap.r32";
-        }
+        }
-        #endregion
+        #endregion
-    }
+    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
index b626f16..75fc428 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
@@ -1,169 +1,169 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using Nini.Config;
+using Nini.Config;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Modules.ExportSerialiser;
+using OpenSim.Region.Environment.Modules.ExportSerialiser;
-using OpenSim.Region.Environment.Modules.Framework;
+using OpenSim.Region.Environment.Modules.Framework;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules.World.Serialiser
+namespace OpenSim.Region.Environment.Modules.World.Serialiser
-{
+{
-    public class SerialiserModule : IRegionModule, IRegionSerialiser
+    public class SerialiserModule : IRegionModule, IRegionSerialiser
-    {
+    {
-        private Commander m_commander = new Commander("Export");
+        private Commander m_commander = new Commander("Export");
-        private List<Scene> m_regions = new List<Scene>();
+        private List<Scene> m_regions = new List<Scene>();
-        private string m_savedir = "exports" + "/";
+        private string m_savedir = "exports" + "/";
-        private List<IFileSerialiser> m_serialisers = new List<IFileSerialiser>();
+        private List<IFileSerialiser> m_serialisers = new List<IFileSerialiser>();
-        #region IRegionModule Members
+        #region IRegionModule Members
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(Scene scene, IConfigSource source)
-        {
+        {
-            scene.RegisterModuleCommander("Export", m_commander);
+            scene.RegisterModuleCommander("Export", m_commander);
-            scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
+            scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
-            scene.RegisterModuleInterface<IRegionSerialiser>(this);
+            scene.RegisterModuleInterface<IRegionSerialiser>(this);
-            lock (m_regions)
+            lock (m_regions)
-            {
+            {
-                m_regions.Add(scene);
+                m_regions.Add(scene);
-            }
+            }
-        }
+        }
-        public void PostInitialise()
+        public void PostInitialise()
-        {
+        {
-            lock (m_serialisers)
+            lock (m_serialisers)
-            {
+            {
-                m_serialisers.Add(new SerialiseTerrain());
+                m_serialisers.Add(new SerialiseTerrain());
-                m_serialisers.Add(new SerialiseObjects());
+                m_serialisers.Add(new SerialiseObjects());
-            }
+            }
-            LoadCommanderCommands();
+            LoadCommanderCommands();
-        }
+        }
-        public void Close()
+        public void Close()
-        {
+        {
-            m_regions.Clear();
+            m_regions.Clear();
-        }
+        }
-        public string Name
+        public string Name
-        {
+        {
-            get { return "ExportSerialisationModule"; }
+            get { return "ExportSerialisationModule"; }
-        }
+        }
-        public bool IsSharedModule
+        public bool IsSharedModule
-        {
+        {
-            get { return true; }
+            get { return true; }
-        }
+        }
-        #endregion
+        #endregion
-        #region IRegionSerialiser Members
+        #region IRegionSerialiser Members
-        public List<string> SerialiseRegion(Scene scene, string saveDir)
+        public List<string> SerialiseRegion(Scene scene, string saveDir)
-        {
+        {
-            List<string> results = new List<string>();
+            List<string> results = new List<string>();
-            if (!Directory.Exists(saveDir))
+            if (!Directory.Exists(saveDir))
-            {
+            {
-                Directory.CreateDirectory(saveDir);
+                Directory.CreateDirectory(saveDir);
-            }
+            }
-            lock (m_serialisers)
+            lock (m_serialisers)
-            {
+            {
-                foreach (IFileSerialiser serialiser in m_serialisers)
+                foreach (IFileSerialiser serialiser in m_serialisers)
-                {
+                {
-                    results.Add(serialiser.WriteToFile(scene, saveDir));
+                    results.Add(serialiser.WriteToFile(scene, saveDir));
-                }
+                }
-            }
+            }
-            TextWriter regionInfoWriter = new StreamWriter(saveDir + "README.TXT");
+            TextWriter regionInfoWriter = new StreamWriter(saveDir + "README.TXT");
-            regionInfoWriter.WriteLine("Region Name: " + scene.RegionInfo.RegionName);
+            regionInfoWriter.WriteLine("Region Name: " + scene.RegionInfo.RegionName);
-            regionInfoWriter.WriteLine("Region ID: " + scene.RegionInfo.RegionID.ToString());
+            regionInfoWriter.WriteLine("Region ID: " + scene.RegionInfo.RegionID.ToString());
-            regionInfoWriter.WriteLine("Backup Time: UTC " + DateTime.UtcNow.ToString());
+            regionInfoWriter.WriteLine("Backup Time: UTC " + DateTime.UtcNow.ToString());
-            regionInfoWriter.WriteLine("Serialise Version: 0.1");
+            regionInfoWriter.WriteLine("Serialise Version: 0.1");
-            regionInfoWriter.Close();
+            regionInfoWriter.Close();
-            TextWriter manifestWriter = new StreamWriter(saveDir + "region.manifest");
+            TextWriter manifestWriter = new StreamWriter(saveDir + "region.manifest");
-            foreach (string line in results)
+            foreach (string line in results)
-            {
+            {
-                manifestWriter.WriteLine(line);
+                manifestWriter.WriteLine(line);
-            }
+            }
-            manifestWriter.Close();
+            manifestWriter.Close();
-            return results;
+            return results;
-        }
+        }
-        #endregion
+        #endregion
-        private void EventManager_OnPluginConsole(string[] args)
+        private void EventManager_OnPluginConsole(string[] args)
-        {
+        {
-            if (args[0] == "export")
+            if (args[0] == "export")
-            {
+            {
-                string[] tmpArgs = new string[args.Length - 2];
+                string[] tmpArgs = new string[args.Length - 2];
-                int i = 0;
+                int i = 0;
-                for (i = 2; i < args.Length; i++)
+                for (i = 2; i < args.Length; i++)
-                    tmpArgs[i - 2] = args[i];
+                    tmpArgs[i - 2] = args[i];
-                m_commander.ProcessConsoleCommand(args[1], tmpArgs);
+                m_commander.ProcessConsoleCommand(args[1], tmpArgs);
-            }
+            }
-        }
+        }
-        private void InterfaceSaveRegion(Object[] args)
+        private void InterfaceSaveRegion(Object[] args)
-        {
+        {
-            foreach (Scene region in m_regions)
+            foreach (Scene region in m_regions)
-            {
+            {
-                if (region.RegionInfo.RegionName == (string) args[0])
+                if (region.RegionInfo.RegionName == (string) args[0])
-                {
+                {
-                    List<string> results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/");
+                    List<string> results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/");
-                }
+                }
-            }
+            }
-        }
+        }
-        private void InterfaceSaveAllRegions(Object[] args)
+        private void InterfaceSaveAllRegions(Object[] args)
-        {
+        {
-            foreach (Scene region in m_regions)
+            foreach (Scene region in m_regions)
-            {
+            {
-                List<string> results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/");
+                List<string> results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/");
-            }
+            }
-        }
+        }
-        private void LoadCommanderCommands()
+        private void LoadCommanderCommands()
-        {
+        {
-            Command serialiseSceneCommand = new Command("save", InterfaceSaveRegion, "Saves the named region into the exports directory.");
+            Command serialiseSceneCommand = new Command("save", InterfaceSaveRegion, "Saves the named region into the exports directory.");
-            serialiseSceneCommand.AddArgument("region-name", "The name of the region you wish to export", "String");
+            serialiseSceneCommand.AddArgument("region-name", "The name of the region you wish to export", "String");
-            Command serialiseAllScenesCommand = new Command("save-all", InterfaceSaveAllRegions, "Saves all regions into the exports directory.");
+            Command serialiseAllScenesCommand = new Command("save-all", InterfaceSaveAllRegions, "Saves all regions into the exports directory.");
-            m_commander.RegisterCommand("save", serialiseSceneCommand);
+            m_commander.RegisterCommand("save", serialiseSceneCommand);
-            m_commander.RegisterCommand("save-all", serialiseAllScenesCommand);
+            m_commander.RegisterCommand("save-all", serialiseAllScenesCommand);
-        }
+        }
-    }
+    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
index a12118e..85c4cdd 100644
--- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
@@ -1,199 +1,199 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using libsecondlife;
+using libsecondlife;
-using Nini.Config;
+using Nini.Config;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules
+namespace OpenSim.Region.Environment.Modules
-{
+{
-    public class SunModule : IRegionModule
+    public class SunModule : IRegionModule
-    {
+    {
-        //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-        private const int m_default_frame = 100;
+        private const int m_default_frame = 100;
-        private const double m_real_day = 24.0;
+        private const double m_real_day = 24.0;
-        private double m_day_length;
+        private double m_day_length;
-        private int m_dilation;
+        private int m_dilation;
-        private int m_frame;
+        private int m_frame;
-        private int m_frame_mod;
+        private int m_frame_mod;
-        private Scene m_scene;
+        private Scene m_scene;
-        private long m_start;
+        private long m_start;
-        #region IRegionModule Members
+        #region IRegionModule Members
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(Scene scene, IConfigSource config)
-        {
+        {
-            m_start = DateTime.Now.Ticks;
+            m_start = DateTime.Now.Ticks;
-            m_frame = 0;
+            m_frame = 0;
-            // Just in case they don't have the stanzas
+            // Just in case they don't have the stanzas
-            try
+            try
-            {
+            {
-                m_day_length = config.Configs["Sun"].GetDouble("day_length", m_real_day);
+                m_day_length = config.Configs["Sun"].GetDouble("day_length", m_real_day);
-                m_frame_mod = config.Configs["Sun"].GetInt("frame_rate", m_default_frame);
+                m_frame_mod = config.Configs["Sun"].GetInt("frame_rate", m_default_frame);
-            }
+            }
-            catch (Exception)
+            catch (Exception)
-            {
+            {
-                m_day_length = m_real_day;
+                m_day_length = m_real_day;
-                m_frame_mod = m_default_frame;
+                m_frame_mod = m_default_frame;
-            }
+            }
-            m_dilation = (int) (m_real_day / m_day_length);
+            m_dilation = (int) (m_real_day / m_day_length);
-            m_scene = scene;
+            m_scene = scene;
-            scene.EventManager.OnFrame += SunUpdate;
+            scene.EventManager.OnFrame += SunUpdate;
-            scene.EventManager.OnNewClient += SunToClient;
+            scene.EventManager.OnNewClient += SunToClient;
-        }
+        }
-        public void PostInitialise()
+        public void PostInitialise()
-        {
+        {
-        }
+        }
-        public void Close()
+        public void Close()
-        {
+        {
-        }
+        }
-        public string Name
+        public string Name
-        {
+        {
-            get { return "SunModule"; }
+            get { return "SunModule"; }
-        }
+        }
-        public bool IsSharedModule
+        public bool IsSharedModule
-        {
+        {
-            get { return false; }
+            get { return false; }
-        }
+        }
-        #endregion
+        #endregion
-        public void SunToClient(IClientAPI client)
+        public void SunToClient(IClientAPI client)
-        {
+        {
-            client.SendSunPos(SunPos(HourOfTheDay()), new LLVector3(0, 0.0f, 10.0f));
+            client.SendSunPos(SunPos(HourOfTheDay()), new LLVector3(0, 0.0f, 10.0f));
-        }
+        }
-        public void SunUpdate()
+        public void SunUpdate()
-        {
+        {
-            if (m_frame < m_frame_mod)
+            if (m_frame < m_frame_mod)
-            {
+            {
-                m_frame++;
+                m_frame++;
-                return;
+                return;
-            }
+            }
-            // m_log.InfoFormat("[SUN]: I've got an update {0} => {1}", m_scene.RegionsInfo.RegionName, HourOfTheDay());
+            // m_log.InfoFormat("[SUN]: I've got an update {0} => {1}", m_scene.RegionsInfo.RegionName, HourOfTheDay());
-            List<ScenePresence> avatars = m_scene.GetAvatars();
+            List<ScenePresence> avatars = m_scene.GetAvatars();
-            foreach (ScenePresence avatar in avatars)
+            foreach (ScenePresence avatar in avatars)
-            {
+            {
-                avatar.ControllingClient.SendSunPos(SunPos(HourOfTheDay()), new LLVector3(0, 0.0f, 10.0f));
+                avatar.ControllingClient.SendSunPos(SunPos(HourOfTheDay()), new LLVector3(0, 0.0f, 10.0f));
-            }
+            }
-            // set estate settings for region access to sun position 
+            // set estate settings for region access to sun position 
-            m_scene.RegionInfo.EstateSettings.sunPosition = SunPos(HourOfTheDay());
+            m_scene.RegionInfo.EstateSettings.sunPosition = SunPos(HourOfTheDay());
-            m_frame = 0;
+            m_frame = 0;
-        }
+        }
-        // Hour of the Day figures out the hour of the day as a float.
+        // Hour of the Day figures out the hour of the day as a float.
-        // The intent here is that we seed hour of the day with real
+        // The intent here is that we seed hour of the day with real
-        // time when the simulator starts, then run time forward
+        // time when the simulator starts, then run time forward
-        // faster based on time dilation factor.  This means that
+        // faster based on time dilation factor.  This means that
-        // ticks don't get out of hand
+        // ticks don't get out of hand
-        private double HourOfTheDay()
+        private double HourOfTheDay()
-        {
+        {
-            long m_addticks = (DateTime.Now.Ticks - m_start) * m_dilation;
+            long m_addticks = (DateTime.Now.Ticks - m_start) * m_dilation;
-            DateTime dt = new DateTime(m_start + m_addticks);
+            DateTime dt = new DateTime(m_start + m_addticks);
-            return (double) dt.Hour + ((double) dt.Minute / 60.0);
+            return (double) dt.Hour + ((double) dt.Minute / 60.0);
-        }
+        }
-        private LLVector3 SunPos(double hour)
+        private LLVector3 SunPos(double hour)
-        {
+        {
-            // now we have our radian position
+            // now we have our radian position
-            double rad = (hour / m_real_day) * 2 * Math.PI - (Math.PI / 2.0);
+            double rad = (hour / m_real_day) * 2 * Math.PI - (Math.PI / 2.0);
-            double z = Math.Sin(rad);
+            double z = Math.Sin(rad);
-            double x = Math.Cos(rad);
+            double x = Math.Cos(rad);
-            return new LLVector3((float) x, 0f, (float) z);
+            return new LLVector3((float) x, 0f, (float) z);
-        }
+        }
-        // TODO: clear this out.  This is here so that I remember to
+        // TODO: clear this out.  This is here so that I remember to
-        // figure out if we need those other packet fields that I've
+        // figure out if we need those other packet fields that I've
-        // left out so far
+        // left out so far
-        //
+        //
-        //        public void SendViewerTime(int phase)
+        //        public void SendViewerTime(int phase)
-        //  {
+        //  {
-        //             Console.WriteLine("SunPhase: {0}", phase);
+        //             Console.WriteLine("SunPhase: {0}", phase);
-        //             SimulatorViewerTimeMessagePacket viewertime = new SimulatorViewerTimeMessagePacket();
+        //             SimulatorViewerTimeMessagePacket viewertime = new SimulatorViewerTimeMessagePacket();
-        //             //viewertime.TimeInfo.SecPerDay = 86400;
+        //             //viewertime.TimeInfo.SecPerDay = 86400;
-        //             // viewertime.TimeInfo.SecPerYear = 31536000;
+        //             // viewertime.TimeInfo.SecPerYear = 31536000;
-        //             viewertime.TimeInfo.SecPerDay = 1000;
+        //             viewertime.TimeInfo.SecPerDay = 1000;
-        //             viewertime.TimeInfo.SecPerYear = 365000;
+        //             viewertime.TimeInfo.SecPerYear = 365000;
-        //             viewertime.TimeInfo.SunPhase = 1;
+        //             viewertime.TimeInfo.SunPhase = 1;
-        //             int sunPhase = (phase + 2)/2;
+        //             int sunPhase = (phase + 2)/2;
-        //             if ((sunPhase < 6) || (sunPhase > 36))
+        //             if ((sunPhase < 6) || (sunPhase > 36))
-        //             {
+        //             {
-        //                 viewertime.TimeInfo.SunDirection = new LLVector3(0f, 0.8f, -0.8f);
+        //                 viewertime.TimeInfo.SunDirection = new LLVector3(0f, 0.8f, -0.8f);
-        //                 Console.WriteLine("sending night");
+        //                 Console.WriteLine("sending night");
-        //             }
+        //             }
-        //             else
+        //             else
-        //             {
+        //             {
-        //                 if (sunPhase < 12)
+        //                 if (sunPhase < 12)
-        //                 {
+        //                 {
-        //                     sunPhase = 12;
+        //                     sunPhase = 12;
-        //                 }
+        //                 }
-        //                 sunPhase = sunPhase - 12;
+        //                 sunPhase = sunPhase - 12;
-        //
+        //
-        //                 float yValue = 0.1f*(sunPhase);
+        //                 float yValue = 0.1f*(sunPhase);
-        //                 Console.WriteLine("Computed SunPhase: {0}, yValue: {1}", sunPhase, yValue);
+        //                 Console.WriteLine("Computed SunPhase: {0}, yValue: {1}", sunPhase, yValue);
-        //                 if (yValue > 1.2f)
+        //                 if (yValue > 1.2f)
-        //                 {
+        //                 {
-        //                     yValue = yValue - 1.2f;
+        //                     yValue = yValue - 1.2f;
-        //                 }
+        //                 }
-        //                 if (yValue > 1)
+        //                 if (yValue > 1)
-        //                 {
+        //                 {
-        //                     yValue = 1;
+        //                     yValue = 1;
-        //                 }
+        //                 }
-        //                 if (yValue < 0)
+        //                 if (yValue < 0)
-        //                 {
+        //                 {
-        //                     yValue = 0;
+        //                     yValue = 0;
-        //                 }
+        //                 }
-        //                 if (sunPhase < 14)
+        //                 if (sunPhase < 14)
-        //                 {
+        //                 {
-        //                     yValue = 1 - yValue;
+        //                     yValue = 1 - yValue;
-        //                 }
+        //                 }
-        //                 if (sunPhase < 12)
+        //                 if (sunPhase < 12)
-        //                 {
+        //                 {
-        //                     yValue *= -1;
+        //                     yValue *= -1;
-        //                 }
+        //                 }
-        //                 viewertime.TimeInfo.SunDirection = new LLVector3(0f, yValue, 0.3f);
+        //                 viewertime.TimeInfo.SunDirection = new LLVector3(0f, yValue, 0.3f);
-        //                 Console.WriteLine("sending sun update " + yValue);
+        //                 Console.WriteLine("sending sun update " + yValue);
-        //             }
+        //             }
-        //             viewertime.TimeInfo.SunAngVelocity = new LLVector3(0, 0.0f, 10.0f);
+        //             viewertime.TimeInfo.SunAngVelocity = new LLVector3(0, 0.0f, 10.0f);
-        //             viewertime.TimeInfo.UsecSinceStart = (ulong) Util.UnixTimeSinceEpoch();
+        //             viewertime.TimeInfo.UsecSinceStart = (ulong) Util.UnixTimeSinceEpoch();
-        //             // OutPacket(viewertime);
+        //             // OutPacket(viewertime);
-        // }
+        // }
-    }
+    }
 }
 \ No newline at end of file
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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes;
+using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes;
-using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
+using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects
+namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects
-{
+{
-    internal class CookieCutter : ITerrainEffect
+    internal class CookieCutter : ITerrainEffect
-    {
+    {
-        #region ITerrainEffect Members
+        #region ITerrainEffect Members
-        public void RunEffect(ITerrainChannel map)
+        public void RunEffect(ITerrainChannel map)
-        {
+        {
-            SmoothArea smooth = new SmoothArea();
+            SmoothArea smooth = new SmoothArea();
-            ITerrainPaintableEffect eroder = new WeatherSphere();
+            ITerrainPaintableEffect eroder = new WeatherSphere();
-            bool[,] cliffMask = new bool[map.Width,map.Height];
+            bool[,] cliffMask = new bool[map.Width,map.Height];
-            bool[,] channelMask = new bool[map.Width,map.Height];
+            bool[,] channelMask = new bool[map.Width,map.Height];
-            bool[,] smoothMask = new bool[map.Width,map.Height];
+            bool[,] smoothMask = new bool[map.Width,map.Height];
-            Console.WriteLine("S1");
+            Console.WriteLine("S1");
-            // Step one, generate rough mask
+            // Step one, generate rough mask
-            int x, y;
+            int x, y;
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    Console.Write(".");
+                    Console.Write(".");
-                    smoothMask[x, y] = true;
+                    smoothMask[x, y] = true;
-                    // Start underwater
+                    // Start underwater
-                    map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 5;
+                    map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 5;
-                    // Add a little height. (terrain should now be above water, mostly.)
+                    // Add a little height. (terrain should now be above water, mostly.)
-                    map[x, y] += 20;
+                    map[x, y] += 20;
-                    int channelsX = 4;
+                    int channelsX = 4;
-                    int channelWidth = (map.Width / channelsX / 4);
+                    int channelWidth = (map.Width / channelsX / 4);
-                    int channelsY = 4;
+                    int channelsY = 4;
-                    int channelHeight = (map.Height / 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, channelsX, channelWidth, map.Width, x);
-                    SetLowerChannel(map, cliffMask, channelMask, x, y, channelsY, channelHeight, map.Height, y);
+                    SetLowerChannel(map, cliffMask, channelMask, x, y, channelsY, channelHeight, map.Height, y);
-                }
+                }
-            }
+            }
-            Console.WriteLine("S2");
+            Console.WriteLine("S2");
-            //smooth.FloodEffect(map, smoothMask, 4.0);
+            //smooth.FloodEffect(map, smoothMask, 4.0);
-            Console.WriteLine("S3");
+            Console.WriteLine("S3");
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    if (cliffMask[x, y] == true)
+                    if (cliffMask[x, y] == true)
-                        eroder.PaintEffect(map, x, y, 4, 0.1);
+                        eroder.PaintEffect(map, x, y, 4, 0.1);
-                }
+                }
-            }
+            }
-            for (x = 0; x < map.Width; x += 2)
+            for (x = 0; x < map.Width; x += 2)
-            {
+            {
-                for (y = 0; y < map.Height; y += 2)
+                for (y = 0; y < map.Height; y += 2)
-                {
+                {
-                    if (map[x, y] < 0.1)
+                    if (map[x, y] < 0.1)
-                        map[x, y] = 0.1;
+                        map[x, y] = 0.1;
-                    if (map[x, y] > 256)
+                    if (map[x, y] > 256)
-                        map[x, y] = 256;
+                        map[x, y] = 256;
-                }
+                }
-            }
+            }
-            //smooth.FloodEffect(map, smoothMask, 4.0);
+            //smooth.FloodEffect(map, smoothMask, 4.0);
-        }
+        }
-        #endregion
+        #endregion
-        private static void SetLowerChannel(ITerrainChannel map, bool[,] cliffMask, bool[,] channelMask, int x, int y, int numChannels, int channelWidth,
+        private static void SetLowerChannel(ITerrainChannel map, bool[,] cliffMask, bool[,] channelMask, int x, int y, int numChannels, int channelWidth,
-                                            int mapSize, int rp)
+                                            int mapSize, int rp)
-        {
+        {
-            for (int i = 0; i < numChannels; i++)
+            for (int i = 0; i < numChannels; i++)
-            {
+            {
-                double distanceToLine = Math.Abs(rp - ((mapSize / numChannels) * i));
+                double distanceToLine = Math.Abs(rp - ((mapSize / numChannels) * i));
-                if (distanceToLine < channelWidth)
+                if (distanceToLine < channelWidth)
-                {
+                {
-                    if (channelMask[x, y])
+                    if (channelMask[x, y])
-                        return;
+                        return;
-                    // Remove channels
+                    // Remove channels
-                    map[x, y] -= 10;
+                    map[x, y] -= 10;
-                    channelMask[x, y] = true;
+                    channelMask[x, y] = true;
-                }
+                }
-                if (distanceToLine < 1)
+                if (distanceToLine < 1)
-                {
+                {
-                    cliffMask[x, y] = true;
+                    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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects
+namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects
-{
+{
-    internal class DefaultTerrainGenerator : ITerrainEffect
+    internal class DefaultTerrainGenerator : ITerrainEffect
-    {
+    {
-        #region ITerrainEffect Members
+        #region ITerrainEffect Members
-        public void RunEffect(ITerrainChannel map)
+        public void RunEffect(ITerrainChannel map)
-        {
+        {
-            int x, y;
+            int x, y;
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 10;
+                    map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 10;
-                    double spherFac = TerrainUtil.SphericalFactor(x, y, Constants.RegionSize / 2, Constants.RegionSize / 2, 50) * 0.01;
+                    double spherFac = TerrainUtil.SphericalFactor(x, y, Constants.RegionSize / 2, Constants.RegionSize / 2, 50) * 0.01;
-                    if (map[x, y] < spherFac)
+                    if (map[x, y] < spherFac)
-                    {
+                    {
-                        map[x, y] = spherFac;
+                        map[x, y] = spherFac;
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        #endregion
+        #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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System.Drawing;
+using System.Drawing;
-using System.Drawing.Imaging;
+using System.Drawing.Imaging;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
-{
+{
-    /// <summary>
+    /// <summary>
-    /// A generic windows bitmap loader. 
+    /// A generic windows bitmap loader. 
-    /// Should be capable of handling 24-bit RGB images.
+    /// Should be capable of handling 24-bit RGB images.
-    /// 
+    /// 
-    /// Uses the System.Drawing filesystem loader.
+    /// Uses the System.Drawing filesystem loader.
-    /// </summary>
+    /// </summary>
-    internal class BMP : GenericSystemDrawing
+    internal class BMP : GenericSystemDrawing
-    {
+    {
-        /// <summary>
+        /// <summary>
-        /// Exports a file to a image on the disk using a System.Drawing exporter.
+        /// Exports a file to a image on the disk using a System.Drawing exporter.
-        /// </summary>
+        /// </summary>
-        /// <param name="filename">The target filename</param>
+        /// <param name="filename">The target filename</param>
-        /// <param name="map">The terrain channel being saved</param>
+        /// <param name="map">The terrain channel being saved</param>
-        public override void SaveFile(string filename, ITerrainChannel map)
+        public override void SaveFile(string filename, ITerrainChannel map)
-        {
+        {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
-            colours.Save(filename, ImageFormat.Bmp);
+            colours.Save(filename, ImageFormat.Bmp);
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// The human readable version of the file format(s) this loader handles
+        /// The human readable version of the file format(s) this loader handles
-        /// </summary>
+        /// </summary>
-        /// <returns></returns>
+        /// <returns></returns>
-        public override string ToString()
+        public override string ToString()
-        {
+        {
-            return "BMP";
+            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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System.Drawing;
+using System.Drawing;
-using System.Drawing.Imaging;
+using System.Drawing.Imaging;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
-{
+{
-    internal class GIF : GenericSystemDrawing
+    internal class GIF : GenericSystemDrawing
-    {
+    {
-        public override void SaveFile(string filename, ITerrainChannel map)
+        public override void SaveFile(string filename, ITerrainChannel map)
-        {
+        {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
-            colours.Save(filename, ImageFormat.Gif);
+            colours.Save(filename, ImageFormat.Gif);
-        }
+        }
-        public override string ToString()
+        public override string ToString()
-        {
+        {
-            return "GIF";
+            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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using System.Drawing;
+using System.Drawing;
-using System.Drawing.Imaging;
+using System.Drawing.Imaging;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
-{
+{
-    /// <summary>
+    /// <summary>
-    /// A virtual class designed to have methods overloaded, 
+    /// A virtual class designed to have methods overloaded, 
-    /// this class provides an interface for a generic image
+    /// this class provides an interface for a generic image
-    /// saving and loading mechanism, but does not specify the
+    /// saving and loading mechanism, but does not specify the
-    /// format. It should not be insubstantiated directly.
+    /// format. It should not be insubstantiated directly.
-    /// </summary>
+    /// </summary>
-    public class GenericSystemDrawing : ITerrainLoader
+    public class GenericSystemDrawing : ITerrainLoader
-    {
+    {
-        #region ITerrainLoader Members
+        #region ITerrainLoader Members
-        public string FileExtension
+        public string FileExtension
-        {
+        {
-            get { return ".gsd"; }
+            get { return ".gsd"; }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Loads a file from a specified filename on the disk,
+        /// Loads a file from a specified filename on the disk,
-        /// parses the image using the System.Drawing parsers
+        /// parses the image using the System.Drawing parsers
-        /// then returns a terrain channel. Values are
+        /// then returns a terrain channel. Values are
-        /// returned based on HSL brightness between 0m and 128m
+        /// returned based on HSL brightness between 0m and 128m
-        /// </summary>
+        /// </summary>
-        /// <param name="filename">The target image to load</param>
+        /// <param name="filename">The target image to load</param>
-        /// <returns>A terrain channel generated from the image.</returns>
+        /// <returns>A terrain channel generated from the image.</returns>
-        public virtual ITerrainChannel LoadFile(string filename)
+        public virtual ITerrainChannel LoadFile(string filename)
-        {
+        {
-            Bitmap file = new Bitmap(filename);
+            Bitmap file = new Bitmap(filename);
-            ITerrainChannel retval = new TerrainChannel(file.Width, file.Height);
+            ITerrainChannel retval = new TerrainChannel(file.Width, file.Height);
-            int x, y;
+            int x, y;
-            for (x = 0; x < file.Width; x++)
+            for (x = 0; x < file.Width; x++)
-            {
+            {
-                for (y = 0; y < file.Height; y++)
+                for (y = 0; y < file.Height; y++)
-                {
+                {
-                    retval[x, y] = file.GetPixel(x, y).GetBrightness() * 128;
+                    retval[x, y] = file.GetPixel(x, y).GetBrightness() * 128;
-                }
+                }
-            }
+            }
-            return retval;
+            return retval;
-        }
+        }
-        public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h)
+        public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h)
-        {
+        {
-            throw new NotImplementedException();
+            throw new NotImplementedException();
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Exports a file to a image on the disk using a System.Drawing exporter.
+        /// Exports a file to a image on the disk using a System.Drawing exporter.
-        /// </summary>
+        /// </summary>
-        /// <param name="filename">The target filename</param>
+        /// <param name="filename">The target filename</param>
-        /// <param name="map">The terrain channel being saved</param>
+        /// <param name="map">The terrain channel being saved</param>
-        public virtual void SaveFile(string filename, ITerrainChannel map)
+        public virtual void SaveFile(string filename, ITerrainChannel map)
-        {
+        {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
-            colours.Save(filename, ImageFormat.Png);
+            colours.Save(filename, ImageFormat.Png);
-        }
+        }
-        #endregion
+        #endregion
-        public override string ToString()
+        public override string ToString()
-        {
+        {
-            return "SYS.DRAWING";
+            return "SYS.DRAWING";
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Protected method, generates a grayscale bitmap 
+        /// Protected method, generates a grayscale bitmap 
-        /// image from a specified terrain channel.
+        /// image from a specified terrain channel.
-        /// </summary>
+        /// </summary>
-        /// <param name="map">The terrain channel to export to bitmap</param>
+        /// <param name="map">The terrain channel to export to bitmap</param>
-        /// <returns>A System.Drawing.Bitmap containing a grayscale image</returns>
+        /// <returns>A System.Drawing.Bitmap containing a grayscale image</returns>
-        protected Bitmap CreateGrayscaleBitmapFromMap(ITerrainChannel map)
+        protected Bitmap CreateGrayscaleBitmapFromMap(ITerrainChannel map)
-        {
+        {
-            Bitmap bmp = new Bitmap(map.Width, map.Height);
+            Bitmap bmp = new Bitmap(map.Width, map.Height);
-            int pallete = 256;
+            int pallete = 256;
-            Color[] grays = new Color[pallete];
+            Color[] grays = new Color[pallete];
-            for (int i = 0; i < grays.Length; i++)
+            for (int i = 0; i < grays.Length; i++)
-            {
+            {
-                grays[i] = Color.FromArgb(i, i, i);
+                grays[i] = Color.FromArgb(i, i, i);
-            }
+            }
-            for (int y = 0; y < map.Height; y++)
+            for (int y = 0; y < map.Height; y++)
-            {
+            {
-                for (int x = 0; x < map.Width; x++)
+                for (int x = 0; x < map.Width; x++)
-                {
+                {
-                    // 512 is the largest possible height before colours clamp
+                    // 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));
+                    int colorindex = (int) (Math.Max(Math.Min(1.0, map[x, y] / 128.0), 0.0) * (pallete - 1));
-                    // Handle error conditions
+                    // Handle error conditions
-                    if (colorindex > pallete - 1 || colorindex < 0)
+                    if (colorindex > pallete - 1 || colorindex < 0)
-                        bmp.SetPixel(x, map.Height - y - 1, Color.Red);
+                        bmp.SetPixel(x, map.Height - y - 1, Color.Red);
-                    else
+                    else
-                        bmp.SetPixel(x, map.Height - y - 1, grays[colorindex]);
+                        bmp.SetPixel(x, map.Height - y - 1, grays[colorindex]);
-                }
+                }
-            }
+            }
-            return bmp;
+            return bmp;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Protected method, generates a coloured bitmap 
+        /// Protected method, generates a coloured bitmap 
-        /// image from a specified terrain channel.
+        /// image from a specified terrain channel.
-        /// </summary>
+        /// </summary>
-        /// <param name="map">The terrain channel to export to bitmap</param>
+        /// <param name="map">The terrain channel to export to bitmap</param>
-        /// <returns>A System.Drawing.Bitmap containing a coloured image</returns>
+        /// <returns>A System.Drawing.Bitmap containing a coloured image</returns>
-        protected Bitmap CreateBitmapFromMap(ITerrainChannel map)
+        protected Bitmap CreateBitmapFromMap(ITerrainChannel map)
-        {
+        {
-            Bitmap gradientmapLd = new Bitmap("defaultstripe.png");
+            Bitmap gradientmapLd = new Bitmap("defaultstripe.png");
-            int pallete = gradientmapLd.Height;
+            int pallete = gradientmapLd.Height;
-            Bitmap bmp = new Bitmap(map.Width, map.Height);
+            Bitmap bmp = new Bitmap(map.Width, map.Height);
-            Color[] colours = new Color[pallete];
+            Color[] colours = new Color[pallete];
-            for (int i = 0; i < pallete; i++)
+            for (int i = 0; i < pallete; i++)
-            {
+            {
-                colours[i] = gradientmapLd.GetPixel(0, i);
+                colours[i] = gradientmapLd.GetPixel(0, i);
-            }
+            }
-            for (int y = 0; y < map.Height; y++)
+            for (int y = 0; y < map.Height; y++)
-            {
+            {
-                for (int x = 0; x < map.Width; x++)
+                for (int x = 0; x < map.Width; x++)
-                {
+                {
-                    // 512 is the largest possible height before colours clamp
+                    // 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));
+                    int colorindex = (int) (Math.Max(Math.Min(1.0, map[x, y] / 512.0), 0.0) * (pallete - 1));
-                    // Handle error conditions
+                    // Handle error conditions
-                    if (colorindex > pallete - 1 || colorindex < 0)
+                    if (colorindex > pallete - 1 || colorindex < 0)
-                        bmp.SetPixel(x, map.Height - y - 1, Color.Red);
+                        bmp.SetPixel(x, map.Height - y - 1, Color.Red);
-                    else
+                    else
-                        bmp.SetPixel(x, map.Height - y - 1, colours[colorindex]);
+                        bmp.SetPixel(x, map.Height - y - 1, colours[colorindex]);
-                }
+                }
-            }
+            }
-            return bmp;
+            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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using System.Drawing;
+using System.Drawing;
-using System.Drawing.Imaging;
+using System.Drawing.Imaging;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
-{
+{
-    public class JPEG : ITerrainLoader
+    public class JPEG : ITerrainLoader
-    {
+    {
-        #region ITerrainLoader Members
+        #region ITerrainLoader Members
-        public string FileExtension
+        public string FileExtension
-        {
+        {
-            get { return ".jpg"; }
+            get { return ".jpg"; }
-        }
+        }
-        public ITerrainChannel LoadFile(string filename)
+        public ITerrainChannel LoadFile(string filename)
-        {
+        {
-            throw new NotImplementedException();
+            throw new NotImplementedException();
-        }
+        }
-        public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h)
+        public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h)
-        {
+        {
-            throw new NotImplementedException();
+            throw new NotImplementedException();
-        }
+        }
-        public void SaveFile(string filename, ITerrainChannel map)
+        public void SaveFile(string filename, ITerrainChannel map)
-        {
+        {
-            Bitmap colours = CreateBitmapFromMap(map);
+            Bitmap colours = CreateBitmapFromMap(map);
-            colours.Save(filename, ImageFormat.Jpeg);
+            colours.Save(filename, ImageFormat.Jpeg);
-        }
+        }
-        #endregion
+        #endregion
-        public override string ToString()
+        public override string ToString()
-        {
+        {
-            return "JPEG";
+            return "JPEG";
-        }
+        }
-        private Bitmap CreateBitmapFromMap(ITerrainChannel map)
+        private Bitmap CreateBitmapFromMap(ITerrainChannel map)
-        {
+        {
-            Bitmap gradientmapLd = new Bitmap("defaultstripe.png");
+            Bitmap gradientmapLd = new Bitmap("defaultstripe.png");
-            int pallete = gradientmapLd.Height;
+            int pallete = gradientmapLd.Height;
-            Bitmap bmp = new Bitmap(map.Width, map.Height);
+            Bitmap bmp = new Bitmap(map.Width, map.Height);
-            Color[] colours = new Color[pallete];
+            Color[] colours = new Color[pallete];
-            for (int i = 0; i < pallete; i++)
+            for (int i = 0; i < pallete; i++)
-            {
+            {
-                colours[i] = gradientmapLd.GetPixel(0, i);
+                colours[i] = gradientmapLd.GetPixel(0, i);
-            }
+            }
-            for (int y = 0; y < map.Height; y++)
+            for (int y = 0; y < map.Height; y++)
-            {
+            {
-                for (int x = 0; x < map.Width; x++)
+                for (int x = 0; x < map.Width; x++)
-                {
+                {
-                    // 512 is the largest possible height before colours clamp
+                    // 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));
+                    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]);
+                    bmp.SetPixel(x, map.Height - y - 1, colours[colorindex]);
-                }
+                }
-            }
+            }
-            return bmp;
+            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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using System.IO;
+using System.IO;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
-{
+{
-    public class LLRAW : ITerrainLoader
+    public class LLRAW : ITerrainLoader
-    {
+    {
-        #region ITerrainLoader Members
+        #region ITerrainLoader Members
-        public ITerrainChannel LoadFile(string filename)
+        public ITerrainChannel LoadFile(string filename)
-        {
+        {
-            TerrainChannel retval = new TerrainChannel();
+            TerrainChannel retval = new TerrainChannel();
-            FileInfo file = new FileInfo(filename);
+            FileInfo file = new FileInfo(filename);
-            FileStream s = file.Open(FileMode.Open, FileAccess.Read);
+            FileStream s = file.Open(FileMode.Open, FileAccess.Read);
-            BinaryReader bs = new BinaryReader(s);
+            BinaryReader bs = new BinaryReader(s);
-            int x, y;
+            int x, y;
-            for (y = 0; y < retval.Height; y++)
+            for (y = 0; y < retval.Height; y++)
-            {
+            {
-                for (x = 0; x < retval.Width; x++)
+                for (x = 0; x < retval.Width; x++)
-                {
+                {
-                    retval[x, y] = (double) bs.ReadByte() * ((double) bs.ReadByte() / 127.0);
+                    retval[x, y] = (double) bs.ReadByte() * ((double) bs.ReadByte() / 127.0);
-                    bs.ReadBytes(11); // Advance the stream to next bytes.
+                    bs.ReadBytes(11); // Advance the stream to next bytes.
-                }
+                }
-            }
+            }
-            bs.Close();
+            bs.Close();
-            s.Close();
+            s.Close();
-            return retval;
+            return retval;
-        }
+        }
-        public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h)
+        public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h)
-        {
+        {
-            throw new NotImplementedException();
+            throw new NotImplementedException();
-        }
+        }
-        public void SaveFile(string filename, ITerrainChannel map)
+        public void SaveFile(string filename, ITerrainChannel map)
-        {
+        {
-            FileInfo file = new FileInfo(filename);
+            FileInfo file = new FileInfo(filename);
-            FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write);
+            FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write);
-            BinaryWriter binStream = new BinaryWriter(s);
+            BinaryWriter binStream = new BinaryWriter(s);
-            // Generate a smegging big lookup table to speed the operation up (it needs it)
+            // Generate a smegging big lookup table to speed the operation up (it needs it)
-            double[] lookupHeightTable = new double[65536];
+            double[] lookupHeightTable = new double[65536];
-            int i, j, x, y;
+            int i, j, x, y;
-            for (i = 0; i < 256; i++)
+            for (i = 0; i < 256; i++)
-            {
+            {
-                for (j = 0; j < 256; j++)
+                for (j = 0; j < 256; j++)
-                {
+                {
-                    lookupHeightTable[i + (j * 256)] = ((double) i * ((double) j / 127.0));
+                    lookupHeightTable[i + (j * 256)] = ((double) i * ((double) j / 127.0));
-                }
+                }
-            }
+            }
-            // Output the calculated raw
+            // Output the calculated raw
-            for (y = 0; y < map.Height; y++)
+            for (y = 0; y < map.Height; y++)
-            {
+            {
-                for (x = 0; x < map.Width; x++)
+                for (x = 0; x < map.Width; x++)
-                {
+                {
-                    double t = map[x, y];
+                    double t = map[x, y];
-                    double min = double.MaxValue;
+                    double min = double.MaxValue;
-                    int index = 0;
+                    int index = 0;
-                    for (i = 0; i < 65536; i++)
+                    for (i = 0; i < 65536; i++)
-                    {
+                    {
-                        if (Math.Abs(t - lookupHeightTable[i]) < min)
+                        if (Math.Abs(t - lookupHeightTable[i]) < min)
-                        {
+                        {
-                            min = Math.Abs(t - lookupHeightTable[i]);
+                            min = Math.Abs(t - lookupHeightTable[i]);
-                            index = i;
+                            index = i;
-                        }
+                        }
-                    }
+                    }
-                    byte red = (byte) (index & 0xFF);
+                    byte red = (byte) (index & 0xFF);
-                    byte green = (byte) ((index >> 8) & 0xFF);
+                    byte green = (byte) ((index >> 8) & 0xFF);
-                    byte blue = 20;
+                    byte blue = 20;
-                    byte alpha1 = 0; // Land Parcels
+                    byte alpha1 = 0; // Land Parcels
-                    byte alpha2 = 0; // For Sale Land
+                    byte alpha2 = 0; // For Sale Land
-                    byte alpha3 = 0; // Public Edit Object
+                    byte alpha3 = 0; // Public Edit Object
-                    byte alpha4 = 0; // Public Edit Land
+                    byte alpha4 = 0; // Public Edit Land
-                    byte alpha5 = 255; // Safe Land
+                    byte alpha5 = 255; // Safe Land
-                    byte alpha6 = 255; // Flying Allowed
+                    byte alpha6 = 255; // Flying Allowed
-                    byte alpha7 = 255; // Create Landmark
+                    byte alpha7 = 255; // Create Landmark
-                    byte alpha8 = 255; // Outside Scripts
+                    byte alpha8 = 255; // Outside Scripts
-                    byte alpha9 = red;
+                    byte alpha9 = red;
-                    byte alpha10 = green;
+                    byte alpha10 = green;
-                    binStream.Write(red);
+                    binStream.Write(red);
-                    binStream.Write(green);
+                    binStream.Write(green);
-                    binStream.Write(blue);
+                    binStream.Write(blue);
-                    binStream.Write(alpha1);
+                    binStream.Write(alpha1);
-                    binStream.Write(alpha2);
+                    binStream.Write(alpha2);
-                    binStream.Write(alpha3);
+                    binStream.Write(alpha3);
-                    binStream.Write(alpha4);
+                    binStream.Write(alpha4);
-                    binStream.Write(alpha5);
+                    binStream.Write(alpha5);
-                    binStream.Write(alpha6);
+                    binStream.Write(alpha6);
-                    binStream.Write(alpha7);
+                    binStream.Write(alpha7);
-                    binStream.Write(alpha8);
+                    binStream.Write(alpha8);
-                    binStream.Write(alpha9);
+                    binStream.Write(alpha9);
-                    binStream.Write(alpha10);
+                    binStream.Write(alpha10);
-                }
+                }
-            }
+            }
-            binStream.Close();
+            binStream.Close();
-            s.Close();
+            s.Close();
-        }
+        }
-        public string FileExtension
+        public string FileExtension
-        {
+        {
-            get { return ".raw"; }
+            get { return ".raw"; }
-        }
+        }
-        #endregion
+        #endregion
-        public override string ToString()
+        public override string ToString()
-        {
+        {
-            return "LL/SL RAW";
+            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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System.Drawing;
+using System.Drawing;
-using System.Drawing.Imaging;
+using System.Drawing.Imaging;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
-{
+{
-    internal class PNG : GenericSystemDrawing
+    internal class PNG : GenericSystemDrawing
-    {
+    {
-        public override void SaveFile(string filename, ITerrainChannel map)
+        public override void SaveFile(string filename, ITerrainChannel map)
-        {
+        {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
-            colours.Save(filename, ImageFormat.Png);
+            colours.Save(filename, ImageFormat.Png);
-        }
+        }
-        public override string ToString()
+        public override string ToString()
-        {
+        {
-            return "PNG";
+            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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System.IO;
+using System.IO;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
-{
+{
-    public class RAW32 : ITerrainLoader
+    public class RAW32 : ITerrainLoader
-    {
+    {
-        #region ITerrainLoader Members
+        #region ITerrainLoader Members
-        public string FileExtension
+        public string FileExtension
-        {
+        {
-            get { return ".r32"; }
+            get { return ".r32"; }
-        }
+        }
-        public ITerrainChannel LoadFile(string filename)
+        public ITerrainChannel LoadFile(string filename)
-        {
+        {
-            TerrainChannel retval = new TerrainChannel();
+            TerrainChannel retval = new TerrainChannel();
-            FileInfo file = new FileInfo(filename);
+            FileInfo file = new FileInfo(filename);
-            FileStream s = file.Open(FileMode.Open, FileAccess.Read);
+            FileStream s = file.Open(FileMode.Open, FileAccess.Read);
-            BinaryReader bs = new BinaryReader(s);
+            BinaryReader bs = new BinaryReader(s);
-            int x, y;
+            int x, y;
-            for (y = 0; y < retval.Height; y++)
+            for (y = 0; y < retval.Height; y++)
-            {
+            {
-                for (x = 0; x < retval.Width; x++)
+                for (x = 0; x < retval.Width; x++)
-                {
+                {
-                    retval[x, y] = bs.ReadSingle();
+                    retval[x, y] = bs.ReadSingle();
-                }
+                }
-            }
+            }
-            bs.Close();
+            bs.Close();
-            s.Close();
+            s.Close();
-            return retval;
+            return retval;
-        }
+        }
-        public ITerrainChannel LoadFile(string filename, int offsetX, int offsetY, int fileWidth, int fileHeight, int sectionWidth, int sectionHeight)
+        public ITerrainChannel LoadFile(string filename, int offsetX, int offsetY, int fileWidth, int fileHeight, int sectionWidth, int sectionHeight)
-        {
+        {
-            TerrainChannel retval = new TerrainChannel(sectionWidth, sectionHeight);
+            TerrainChannel retval = new TerrainChannel(sectionWidth, sectionHeight);
-            FileInfo file = new FileInfo(filename);
+            FileInfo file = new FileInfo(filename);
-            FileStream s = file.Open(FileMode.Open, FileAccess.Read);
+            FileStream s = file.Open(FileMode.Open, FileAccess.Read);
-            BinaryReader bs = new BinaryReader(s);
+            BinaryReader bs = new BinaryReader(s);
-            int currFileXOffset = 0;
+            int currFileXOffset = 0;
-            int currFileYOffset = 0;
+            int currFileYOffset = 0;
-            // if our region isn't on the first Y section of the areas to be landscaped, then
+            // if our region isn't on the first Y section of the areas to be landscaped, then
-            // advance to our section of the file
+            // advance to our section of the file
-            while (currFileYOffset < offsetY)
+            while (currFileYOffset < offsetY)
-            {
+            {
-                // read a whole strip of regions
+                // read a whole strip of regions
-                int heightsToRead = sectionHeight * (fileWidth * sectionWidth);
+                int heightsToRead = sectionHeight * (fileWidth * sectionWidth);
-                bs.ReadBytes(heightsToRead * 4); // because the floats are 4 bytes in the file
+                bs.ReadBytes(heightsToRead * 4); // because the floats are 4 bytes in the file
-                currFileYOffset++;
+                currFileYOffset++;
-            }
+            }
-            // got to the Y start offset within the file of our region
+            // got to the Y start offset within the file of our region
-            // so read the file bits associated with our region
+            // so read the file bits associated with our region
-            int x, y;
+            int x, y;
-            // for each Y within our Y offset
+            // for each Y within our Y offset
-            for (y = 0; y < sectionHeight; y++)
+            for (y = 0; y < sectionHeight; y++)
-            {
+            {
-                currFileXOffset = 0;
+                currFileXOffset = 0;
-                // if our region isn't the first X section of the areas to be landscaped, then
+                // 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
+                // advance the stream to the X start pos of our section in the file
-                // i.e. eat X upto where we start
+                // i.e. eat X upto where we start
-                while (currFileXOffset < offsetX)
+                while (currFileXOffset < offsetX)
-                {
+                {
-                    bs.ReadBytes(sectionWidth * 4); // 4 bytes = single
+                    bs.ReadBytes(sectionWidth * 4); // 4 bytes = single
-                    currFileXOffset++;
+                    currFileXOffset++;
-                }
+                }
-                // got to our X offset, so write our regions X line
+                // got to our X offset, so write our regions X line
-                for (x = 0; x < sectionWidth; x++)
+                for (x = 0; x < sectionWidth; x++)
-                {
+                {
-                    // Read a strip and continue
+                    // Read a strip and continue
-                    retval[x, y] = bs.ReadSingle();
+                    retval[x, y] = bs.ReadSingle();
-                }
+                }
-                // record that we wrote it
+                // record that we wrote it
-                currFileXOffset++;
+                currFileXOffset++;
-                // if our region isn't the last X section of the areas to be landscaped, then
+                // 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
+                // advance the stream to the end of this Y column
-                while (currFileXOffset < fileWidth)
+                while (currFileXOffset < fileWidth)
-                {
+                {
-                    // eat the next regions x line
+                    // eat the next regions x line
-                    bs.ReadBytes(sectionWidth * 4); // 4 bytes = single
+                    bs.ReadBytes(sectionWidth * 4); // 4 bytes = single
-                    currFileXOffset++;
+                    currFileXOffset++;
-                }
+                }
-            }
+            }
-            bs.Close();
+            bs.Close();
-            s.Close();
+            s.Close();
-            return retval;
+            return retval;
-        }
+        }
-        public void SaveFile(string filename, ITerrainChannel map)
+        public void SaveFile(string filename, ITerrainChannel map)
-        {
+        {
-            FileInfo file = new FileInfo(filename);
+            FileInfo file = new FileInfo(filename);
-            FileStream s = file.Open(FileMode.Create, FileAccess.Write);
+            FileStream s = file.Open(FileMode.Create, FileAccess.Write);
-            BinaryWriter bs = new BinaryWriter(s);
+            BinaryWriter bs = new BinaryWriter(s);
-            int x, y;
+            int x, y;
-            for (y = 0; y < map.Height; y++)
+            for (y = 0; y < map.Height; y++)
-            {
+            {
-                for (x = 0; x < map.Width; x++)
+                for (x = 0; x < map.Width; x++)
-                {
+                {
-                    bs.Write((float) map[x, y]);
+                    bs.Write((float) map[x, y]);
-                }
+                }
-            }
+            }
-            bs.Close();
+            bs.Close();
-            s.Close();
+            s.Close();
-        }
+        }
-        #endregion
+        #endregion
-        public override string ToString()
+        public override string ToString()
-        {
+        {
-            return "RAW32";
+            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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System.Drawing;
+using System.Drawing;
-using System.Drawing.Imaging;
+using System.Drawing.Imaging;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
-{
+{
-    internal class TIFF : GenericSystemDrawing
+    internal class TIFF : GenericSystemDrawing
-    {
+    {
-        public override void SaveFile(string filename, ITerrainChannel map)
+        public override void SaveFile(string filename, ITerrainChannel map)
-        {
+        {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
-            colours.Save(filename, ImageFormat.Tiff);
+            colours.Save(filename, ImageFormat.Tiff);
-        }
+        }
-        public override string ToString()
+        public override string ToString()
-        {
+        {
-            return "TIFF";
+            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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using System.IO;
+using System.IO;
-using System.Text;
+using System.Text;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
-{
+{
-    /// <summary>
+    /// <summary>
-    /// Terragen File Format Loader
+    /// Terragen File Format Loader
-    /// Built from specification at
+    /// Built from specification at
-    /// http://www.planetside.co.uk/terragen/dev/tgterrain.html
+    /// http://www.planetside.co.uk/terragen/dev/tgterrain.html
-    /// </summary>
+    /// </summary>
-    internal class Terragen : ITerrainLoader
+    internal class Terragen : ITerrainLoader
-    {
+    {
-        #region ITerrainLoader Members
+        #region ITerrainLoader Members
-        public ITerrainChannel LoadFile(string filename)
+        public ITerrainChannel LoadFile(string filename)
-        {
+        {
-            TerrainChannel retval = new TerrainChannel();
+            TerrainChannel retval = new TerrainChannel();
-            FileInfo file = new FileInfo(filename);
+            FileInfo file = new FileInfo(filename);
-            FileStream s = file.Open(FileMode.Open, FileAccess.Read);
+            FileStream s = file.Open(FileMode.Open, FileAccess.Read);
-            BinaryReader bs = new BinaryReader(s);
+            BinaryReader bs = new BinaryReader(s);
-            bool eof = false;
+            bool eof = false;
-            if (ASCIIEncoding.ASCII.GetString(bs.ReadBytes(16)) == "TERRAGENTERRAIN ")
+            if (ASCIIEncoding.ASCII.GetString(bs.ReadBytes(16)) == "TERRAGENTERRAIN ")
-            {
+            {
-                // Terragen file
+                // Terragen file
-                while (eof == false)
+                while (eof == false)
-                {
+                {
-                    int w = 256;
+                    int w = 256;
-                    int h = 256;
+                    int h = 256;
-                    string tmp = ASCIIEncoding.ASCII.GetString(bs.ReadBytes(4));
+                    string tmp = ASCIIEncoding.ASCII.GetString(bs.ReadBytes(4));
-                    switch (tmp)
+                    switch (tmp)
-                    {
+                    {
-                        case "SIZE":
+                        case "SIZE":
-                            int sztmp = bs.ReadInt16() + 1;
+                            int sztmp = bs.ReadInt16() + 1;
-                            w = sztmp;
+                            w = sztmp;
-                            h = sztmp;
+                            h = sztmp;
-                            bs.ReadInt16();
+                            bs.ReadInt16();
-                            break;
+                            break;
-                        case "XPTS":
+                        case "XPTS":
-                            w = bs.ReadInt16();
+                            w = bs.ReadInt16();
-                            bs.ReadInt16();
+                            bs.ReadInt16();
-                            break;
+                            break;
-                        case "YPTS":
+                        case "YPTS":
-                            h = bs.ReadInt16();
+                            h = bs.ReadInt16();
-                            bs.ReadInt16();
+                            bs.ReadInt16();
-                            break;
+                            break;
-                        case "ALTW":
+                        case "ALTW":
-                            eof = true;
+                            eof = true;
-                            Int16 heightScale = bs.ReadInt16();
+                            Int16 heightScale = bs.ReadInt16();
-                            Int16 baseHeight = bs.ReadInt16();
+                            Int16 baseHeight = bs.ReadInt16();
-                            retval = new TerrainChannel(w, h);
+                            retval = new TerrainChannel(w, h);
-                            int x, y;
+                            int x, y;
-                            for (x = 0; x < w; x++)
+                            for (x = 0; x < w; x++)
-                            {
+                            {
-                                for (y = 0; y < h; y++)
+                                for (y = 0; y < h; y++)
-                                {
+                                {
-                                    retval[x, y] = (double) baseHeight + (double) bs.ReadInt16() * (double) heightScale / 65536.0;
+                                    retval[x, y] = (double) baseHeight + (double) bs.ReadInt16() * (double) heightScale / 65536.0;
-                                }
+                                }
-                            }
+                            }
-                            break;
+                            break;
-                        default:
+                        default:
-                            bs.ReadInt32();
+                            bs.ReadInt32();
-                            break;
+                            break;
-                    }
+                    }
-                }
+                }
-            }
+            }
-            bs.Close();
+            bs.Close();
-            s.Close();
+            s.Close();
-            return retval;
+            return retval;
-        }
+        }
-        public void SaveFile(string filename, ITerrainChannel map)
+        public void SaveFile(string filename, ITerrainChannel map)
-        {
+        {
-            char[] header = "TERRAGENTERRAIN".ToCharArray();
+            char[] header = "TERRAGENTERRAIN".ToCharArray();
-            throw new NotImplementedException();
+            throw new NotImplementedException();
-        }
+        }
-        public string FileExtension
+        public string FileExtension
-        {
+        {
-            get { return ".ter"; }
+            get { return ".ter"; }
-        }
+        }
-        public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h)
+        public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h)
-        {
+        {
-            throw new NotImplementedException();
+            throw new NotImplementedException();
-        }
+        }
-        #endregion
+        #endregion
-        public override string ToString()
+        public override string ToString()
-        {
+        {
-            return "Terragen";
+            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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
-{
+{
-    public class FlattenArea : ITerrainFloodEffect
+    public class FlattenArea : ITerrainFloodEffect
-    {
+    {
-        #region ITerrainFloodEffect Members
+        #region ITerrainFloodEffect Members
-        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
+        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
-        {
+        {
-            double sum = 0.0;
+            double sum = 0.0;
-            double steps = 0.0;
+            double steps = 0.0;
-            double avg;
+            double avg;
-            int x, y;
+            int x, y;
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    if (fillArea[x, y])
+                    if (fillArea[x, y])
-                    {
+                    {
-                        sum += map[x, y];
+                        sum += map[x, y];
-                        steps += 1.0;
+                        steps += 1.0;
-                    }
+                    }
-                }
+                }
-            }
+            }
-            avg = sum / steps;
+            avg = sum / steps;
-            double str = 0.1 * strength; // == 0.2 in the default client
+            double str = 0.1 * strength; // == 0.2 in the default client
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    if (fillArea[x, y])
+                    if (fillArea[x, y])
-                        map[x, y] = (map[x, y] * (1.0 - str)) + (avg * str);
+                        map[x, y] = (map[x, y] * (1.0 - str)) + (avg * str);
-                }
+                }
-            }
+            }
-        }
+        }
-        #endregion
+        #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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
-{
+{
-    public class LowerArea : ITerrainFloodEffect
+    public class LowerArea : ITerrainFloodEffect
-    {
+    {
-        #region ITerrainFloodEffect Members
+        #region ITerrainFloodEffect Members
-        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
+        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
-        {
+        {
-            int x;
+            int x;
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                int y;
+                int y;
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    if (fillArea[x, y])
+                    if (fillArea[x, y])
-                    {
+                    {
-                        map[x, y] -= strength;
+                        map[x, y] -= strength;
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        #endregion
+        #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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
-{
+{
-    public class NoiseArea : ITerrainFloodEffect
+    public class NoiseArea : ITerrainFloodEffect
-    {
+    {
-        #region ITerrainFloodEffect Members
+        #region ITerrainFloodEffect Members
-        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
+        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
-        {
+        {
-            int x, y;
+            int x, y;
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    if (fillArea[x, y])
+                    if (fillArea[x, y])
-                    {
+                    {
-                        double noise = TerrainUtil.PerlinNoise2D((double) x / Constants.RegionSize, (double) y / Constants.RegionSize, 8, 1.0);
+                        double noise = TerrainUtil.PerlinNoise2D((double) x / Constants.RegionSize, (double) y / Constants.RegionSize, 8, 1.0);
-                        map[x, y] += noise * strength;
+                        map[x, y] += noise * strength;
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        #endregion
+        #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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
-{
+{
-    public class RaiseArea : ITerrainFloodEffect
+    public class RaiseArea : ITerrainFloodEffect
-    {
+    {
-        #region ITerrainFloodEffect Members
+        #region ITerrainFloodEffect Members
-        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
+        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
-        {
+        {
-            int x, y;
+            int x, y;
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    if (fillArea[x, y])
+                    if (fillArea[x, y])
-                    {
+                    {
-                        map[x, y] += strength;
+                        map[x, y] += strength;
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        #endregion
+        #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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
-{
+{
-    public class RevertArea : ITerrainFloodEffect
+    public class RevertArea : ITerrainFloodEffect
-    {
+    {
-        private readonly ITerrainChannel m_revertmap;
+        private readonly ITerrainChannel m_revertmap;
-        public RevertArea(ITerrainChannel revertmap)
+        public RevertArea(ITerrainChannel revertmap)
-        {
+        {
-            m_revertmap = revertmap;
+            m_revertmap = revertmap;
-        }
+        }
-        #region ITerrainFloodEffect Members
+        #region ITerrainFloodEffect Members
-        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
+        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
-        {
+        {
-            int x, y;
+            int x, y;
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    if (fillArea[x, y])
+                    if (fillArea[x, y])
-                    {
+                    {
-                        map[x, y] = (map[x, y] * (1.0 - strength)) + (m_revertmap[x, y] * strength);
+                        map[x, y] = (map[x, y] * (1.0 - strength)) + (m_revertmap[x, y] * strength);
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        #endregion
+        #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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
+namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
-{
+{
-    public class SmoothArea : ITerrainFloodEffect
+    public class SmoothArea : ITerrainFloodEffect
-    {
+    {
-        #region ITerrainFloodEffect Members
+        #region ITerrainFloodEffect Members
-        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
+        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
-        {
+        {
-            double area = strength;
+            double area = strength;
-            double step = strength / 4.0;
+            double step = strength / 4.0;
-            double[,] manipulate = new double[map.Width,map.Height];
+            double[,] manipulate = new double[map.Width,map.Height];
-            int x, y;
+            int x, y;
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    if (!fillArea[x, y])
+                    if (!fillArea[x, y])
-                        continue;
+                        continue;
-                    double average = 0.0;
+                    double average = 0.0;
-                    int avgsteps = 0;
+                    int avgsteps = 0;
-                    double n;
+                    double n;
-                    for (n = 0.0 - area; n < area; n += step)
+                    for (n = 0.0 - area; n < area; n += step)
-                    {
+                    {
-                        double l;
+                        double l;
-                        for (l = 0.0 - area; l < area; l += step)
+                        for (l = 0.0 - area; l < area; l += step)
-                        {
+                        {
-                            avgsteps++;
+                            avgsteps++;
-                            average += GetBilinearInterpolate(x + n, y + l, map);
+                            average += GetBilinearInterpolate(x + n, y + l, map);
-                        }
+                        }
-                    }
+                    }
-                    manipulate[x, y] = average / avgsteps;
+                    manipulate[x, y] = average / avgsteps;
-                }
+                }
-            }
+            }
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    if (!fillArea[x, y])
+                    if (!fillArea[x, y])
-                        continue;
+                        continue;
-                    map[x, y] = manipulate[x, y];
+                    map[x, y] = manipulate[x, y];
-                }
+                }
-            }
+            }
-        }
+        }
-        #endregion
+        #endregion
-        private static double GetBilinearInterpolate(double x, double y, ITerrainChannel map)
+        private static double GetBilinearInterpolate(double x, double y, ITerrainChannel map)
-        {
+        {
-            int w = map.Width;
+            int w = map.Width;
-            int h = map.Height;
+            int h = map.Height;
-            if (x > w - 2.0)
+            if (x > w - 2.0)
-                x = w - 2.0;
+                x = w - 2.0;
-            if (y > h - 2.0)
+            if (y > h - 2.0)
-                y = h - 2.0;
+                y = h - 2.0;
-            if (x < 0.0)
+            if (x < 0.0)
-                x = 0.0;
+                x = 0.0;
-            if (y < 0.0)
+            if (y < 0.0)
-                y = 0.0;
+                y = 0.0;
-            int stepSize = 1;
+            int stepSize = 1;
-            double h00 = map[(int) x, (int) y];
+            double h00 = map[(int) x, (int) y];
-            double h10 = map[(int) x + stepSize, (int) y];
+            double h10 = map[(int) x + stepSize, (int) y];
-            double h01 = map[(int) x, (int) y + stepSize];
+            double h01 = map[(int) x, (int) y + stepSize];
-            double h11 = map[(int) x + stepSize, (int) y + stepSize];
+            double h11 = map[(int) x + stepSize, (int) y + stepSize];
-            double h1 = h00;
+            double h1 = h00;
-            double h2 = h10;
+            double h2 = h10;
-            double h3 = h01;
+            double h3 = h01;
-            double h4 = h11;
+            double h4 = h11;
-            double a00 = h1;
+            double a00 = h1;
-            double a10 = h2 - h1;
+            double a10 = h2 - h1;
-            double a01 = h3 - h1;
+            double a01 = h3 - h1;
-            double a11 = h1 - h2 - h3 + h4;
+            double a11 = h1 - h2 - h3 + h4;
-            double partialx = x - (int) x;
+            double partialx = x - (int) x;
-            double partialz = y - (int) y;
+            double partialz = y - (int) y;
-            double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz);
+            double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz);
-            return hi;
+            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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain
+namespace OpenSim.Region.Environment.Modules.World.Terrain
-{
+{
-    public interface ITerrainEffect
+    public interface ITerrainEffect
-    {
+    {
-        void RunEffect(ITerrainChannel map);
+        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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain
+namespace OpenSim.Region.Environment.Modules.World.Terrain
-{
+{
-    public interface ITerrainFloodEffect
+    public interface ITerrainFloodEffect
-    {
+    {
-        void FloodEffect(ITerrainChannel map, Boolean[,] fillArea, double strength);
+        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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain
+namespace OpenSim.Region.Environment.Modules.World.Terrain
-{
+{
-    public interface ITerrainLoader
+    public interface ITerrainLoader
-    {
+    {
-        string FileExtension { get; }
+        string FileExtension { get; }
-        ITerrainChannel LoadFile(string filename);
+        ITerrainChannel LoadFile(string filename);
-        ITerrainChannel LoadFile(string filename, int fileStartX, int fileStartY, int fileWidth, int fileHeight, int sectionWidth, int sectionHeight);
+        ITerrainChannel LoadFile(string filename, int fileStartX, int fileStartY, int fileWidth, int fileHeight, int sectionWidth, int sectionHeight);
-        void SaveFile(string filename, ITerrainChannel map);
+        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
+namespace OpenSim.Region.Environment.Modules.World.Terrain
-{
+{
-    public interface ITerrainModule
+    public interface ITerrainModule
-    {
+    {
-        void LoadFromFile(string filename);
+        void LoadFromFile(string filename);
-        void SaveToFile(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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain
+namespace OpenSim.Region.Environment.Modules.World.Terrain
-{
+{
-    public interface ITerrainPaintableEffect
+    public interface ITerrainPaintableEffect
-    {
+    {
-        void PaintEffect(ITerrainChannel map, double x, double y, double strength, double duration);
+        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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using System.Drawing;
+using System.Drawing;
-using Nini.Config;
+using Nini.Config;
-using OpenJPEGNet;
+using OpenJPEGNet;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules.World.Terrain
+namespace OpenSim.Region.Environment.Modules.World.Terrain
-{
+{
-    internal class MapImageModule : IMapImageGenerator, IRegionModule
+    internal class MapImageModule : IMapImageGenerator, IRegionModule
-    {
+    {
-        private Scene m_scene;
+        private Scene m_scene;
-        #region IMapImageGenerator Members
+        #region IMapImageGenerator Members
-        public byte[] WriteJpeg2000Image(string gradientmap)
+        public byte[] WriteJpeg2000Image(string gradientmap)
-        {
+        {
-            byte[] imageData = null;
+            byte[] imageData = null;
-            Bitmap bmp = TerrainToBitmap(gradientmap);
+            Bitmap bmp = TerrainToBitmap(gradientmap);
-            try
+            try
-            {
+            {
-                imageData = OpenJPEG.EncodeFromImage(bmp, true);
+                imageData = OpenJPEG.EncodeFromImage(bmp, true);
-            }
+            }
-            catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke
+            catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke
-            {
+            {
-                Console.WriteLine("Failed generating terrain map: " + e);
+                Console.WriteLine("Failed generating terrain map: " + e);
-            }
+            }
-            return imageData;
+            return imageData;
-        }
+        }
-        #endregion
+        #endregion
-        #region IRegionModule Members
+        #region IRegionModule Members
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(Scene scene, IConfigSource source)
-        {
+        {
-            m_scene = scene;
+            m_scene = scene;
-            m_scene.RegisterModuleInterface<IMapImageGenerator>(this);
+            m_scene.RegisterModuleInterface<IMapImageGenerator>(this);
-        }
+        }
-        public void PostInitialise()
+        public void PostInitialise()
-        {
+        {
-        }
+        }
-        public void Close()
+        public void Close()
-        {
+        {
-        }
+        }
-        public string Name
+        public string Name
-        {
+        {
-            get { return "MapImageModule"; }
+            get { return "MapImageModule"; }
-        }
+        }
-        public bool IsSharedModule
+        public bool IsSharedModule
-        {
+        {
-            get { return false; }
+            get { return false; }
-        }
+        }
-        #endregion
+        #endregion
-        private void ShadeBuildings(ref Bitmap map)
+        private void ShadeBuildings(ref Bitmap map)
-        {
+        {
-            lock (map)
+            lock (map)
-            {
+            {
-                lock (m_scene.Entities)
+                lock (m_scene.Entities)
-                {
+                {
-                    foreach (EntityBase entity in m_scene.Entities.Values)
+                    foreach (EntityBase entity in m_scene.Entities.Values)
-                    {
+                    {
-                        if (entity is SceneObjectGroup)
+                        if (entity is SceneObjectGroup)
-                        {
+                        {
-                            SceneObjectGroup sog = (SceneObjectGroup) entity;
+                            SceneObjectGroup sog = (SceneObjectGroup) entity;
-                            foreach (SceneObjectPart primitive in sog.Children.Values)
+                            foreach (SceneObjectPart primitive in sog.Children.Values)
-                            {
+                            {
-                                int x, y, w, h;
+                                int x, y, w, h;
-                                x = (int) (primitive.AbsolutePosition.X - (primitive.Scale.X / 2));
+                                x = (int) (primitive.AbsolutePosition.X - (primitive.Scale.X / 2));
-                                y = (int) (primitive.AbsolutePosition.Y - (primitive.Scale.Y / 2));
+                                y = (int) (primitive.AbsolutePosition.Y - (primitive.Scale.Y / 2));
-                                w = (int) primitive.Scale.X;
+                                w = (int) primitive.Scale.X;
-                                h = (int) primitive.Scale.Y;
+                                h = (int) primitive.Scale.Y;
-                                int dx;
+                                int dx;
-                                for (dx = x; dx < x + w; dx++)
+                                for (dx = x; dx < x + w; dx++)
-                                {
+                                {
-                                    int dy;
+                                    int dy;
-                                    for (dy = y; dy < y + h; dy++)
+                                    for (dy = y; dy < y + h; dy++)
-                                    {
+                                    {
-                                        if (x < 0 || y < 0)
+                                        if (x < 0 || y < 0)
-                                            continue;
+                                            continue;
-                                        if (x >= map.Width || y >= map.Height)
+                                        if (x >= map.Width || y >= map.Height)
-                                            continue;
+                                            continue;
-                                        map.SetPixel(dx, dy, Color.DarkGray);
+                                        map.SetPixel(dx, dy, Color.DarkGray);
-                                    }
+                                    }
-                                }
+                                }
-                            }
+                            }
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        private Bitmap TerrainToBitmap(string gradientmap)
+        private Bitmap TerrainToBitmap(string gradientmap)
-        {
+        {
-            Bitmap gradientmapLd = new Bitmap(gradientmap);
+            Bitmap gradientmapLd = new Bitmap(gradientmap);
-            int pallete = gradientmapLd.Height;
+            int pallete = gradientmapLd.Height;
-            Bitmap bmp = new Bitmap(m_scene.Heightmap.Width, m_scene.Heightmap.Height);
+            Bitmap bmp = new Bitmap(m_scene.Heightmap.Width, m_scene.Heightmap.Height);
-            Color[] colours = new Color[pallete];
+            Color[] colours = new Color[pallete];
-            for (int i = 0; i < pallete; i++)
+            for (int i = 0; i < pallete; i++)
-            {
+            {
-                colours[i] = gradientmapLd.GetPixel(0, i);
+                colours[i] = gradientmapLd.GetPixel(0, i);
-            }
+            }
-            lock (m_scene.Heightmap)
+            lock (m_scene.Heightmap)
-            {
+            {
-                ITerrainChannel copy = m_scene.Heightmap;
+                ITerrainChannel copy = m_scene.Heightmap;
-                for (int y = 0; y < copy.Height; y++)
+                for (int y = 0; y < copy.Height; y++)
-                {
+                {
-                    for (int x = 0; x < copy.Width; x++)
+                    for (int x = 0; x < copy.Width; x++)
-                    {
+                    {
-                        // 512 is the largest possible height before colours clamp
+                        // 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));
+                        int colorindex = (int) (Math.Max(Math.Min(1.0, copy[x, y] / 512.0), 0.0) * (pallete - 1));
-                        // Handle error conditions
+                        // Handle error conditions
-                        if (colorindex > pallete - 1 || colorindex < 0)
+                        if (colorindex > pallete - 1 || colorindex < 0)
-                            bmp.SetPixel(x, copy.Height - y - 1, Color.Red);
+                            bmp.SetPixel(x, copy.Height - y - 1, Color.Red);
-                        else
+                        else
-                            bmp.SetPixel(x, copy.Height - y - 1, colours[colorindex]);
+                            bmp.SetPixel(x, copy.Height - y - 1, colours[colorindex]);
-                    }
+                    }
-                }
+                }
-                ShadeBuildings(ref bmp);
+                ShadeBuildings(ref bmp);
-                return 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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
+{
-    /// <summary>
+    /// <summary>
-    /// Hydraulic Erosion Brush
+    /// Hydraulic Erosion Brush
-    /// </summary>
+    /// </summary>
-    public class ErodeSphere : ITerrainPaintableEffect
+    public class ErodeSphere : ITerrainPaintableEffect
-    {
+    {
-        private double rainHeight = 0.2;
+        private double rainHeight = 0.2;
-        private int rounds = 10;
+        private int rounds = 10;
-        private NeighbourSystem type = NeighbourSystem.Moore; // Parameter
+        private NeighbourSystem type = NeighbourSystem.Moore; // Parameter
-        private double waterSaturation = 0.30; // Can carry 1% of water in height
+        private double waterSaturation = 0.30; // Can carry 1% of water in height
-        #region Supporting Functions
+        #region Supporting Functions
-        private int[] Neighbours(NeighbourSystem type, int index)
+        private int[] Neighbours(NeighbourSystem type, int index)
-        {
+        {
-            int[] coord = new int[2];
+            int[] coord = new int[2];
-            index++;
+            index++;
-            switch (type)
+            switch (type)
-            {
+            {
-                case NeighbourSystem.Moore:
+                case NeighbourSystem.Moore:
-                    switch (index)
+                    switch (index)
-                    {
+                    {
-                        case 1:
+                        case 1:
-                            coord[0] = -1;
+                            coord[0] = -1;
-                            coord[1] = -1;
+                            coord[1] = -1;
-                            break;
+                            break;
-                        case 2:
+                        case 2:
-                            coord[0] = -0;
+                            coord[0] = -0;
-                            coord[1] = -1;
+                            coord[1] = -1;
-                            break;
+                            break;
-                        case 3:
+                        case 3:
-                            coord[0] = +1;
+                            coord[0] = +1;
-                            coord[1] = -1;
+                            coord[1] = -1;
-                            break;
+                            break;
-                        case 4:
+                        case 4:
-                            coord[0] = -1;
+                            coord[0] = -1;
-                            coord[1] = -0;
+                            coord[1] = -0;
-                            break;
+                            break;
-                        case 5:
+                        case 5:
-                            coord[0] = -0;
+                            coord[0] = -0;
-                            coord[1] = -0;
+                            coord[1] = -0;
-                            break;
+                            break;
-                        case 6:
+                        case 6:
-                            coord[0] = +1;
+                            coord[0] = +1;
-                            coord[1] = -0;
+                            coord[1] = -0;
-                            break;
+                            break;
-                        case 7:
+                        case 7:
-                            coord[0] = -1;
+                            coord[0] = -1;
-                            coord[1] = +1;
+                            coord[1] = +1;
-                            break;
+                            break;
-                        case 8:
+                        case 8:
-                            coord[0] = -0;
+                            coord[0] = -0;
-                            coord[1] = +1;
+                            coord[1] = +1;
-                            break;
+                            break;
-                        case 9:
+                        case 9:
-                            coord[0] = +1;
+                            coord[0] = +1;
-                            coord[1] = +1;
+                            coord[1] = +1;
-                            break;
+                            break;
-                        default:
+                        default:
-                            break;
+                            break;
-                    }
+                    }
-                    break;
+                    break;
-                case NeighbourSystem.VonNeumann:
+                case NeighbourSystem.VonNeumann:
-                    switch (index)
+                    switch (index)
-                    {
+                    {
-                        case 1:
+                        case 1:
-                            coord[0] = 0;
+                            coord[0] = 0;
-                            coord[1] = -1;
+                            coord[1] = -1;
-                            break;
+                            break;
-                        case 2:
+                        case 2:
-                            coord[0] = -1;
+                            coord[0] = -1;
-                            coord[1] = 0;
+                            coord[1] = 0;
-                            break;
+                            break;
-                        case 3:
+                        case 3:
-                            coord[0] = +1;
+                            coord[0] = +1;
-                            coord[1] = 0;
+                            coord[1] = 0;
-                            break;
+                            break;
-                        case 4:
+                        case 4:
-                            coord[0] = 0;
+                            coord[0] = 0;
-                            coord[1] = +1;
+                            coord[1] = +1;
-                            break;
+                            break;
-                        case 5:
+                        case 5:
-                            coord[0] = -0;
+                            coord[0] = -0;
-                            coord[1] = -0;
+                            coord[1] = -0;
-                            break;
+                            break;
-                        default:
+                        default:
-                            break;
+                            break;
-                    }
+                    }
-                    break;
+                    break;
-            }
+            }
-            return coord;
+            return coord;
-        }
+        }
-        private enum NeighbourSystem
+        private enum NeighbourSystem
-        {
+        {
-            Moore,
+            Moore,
-            VonNeumann
+            VonNeumann
-        } ;
+        } ;
-        #endregion
+        #endregion
-        #region ITerrainPaintableEffect Members
+        #region ITerrainPaintableEffect Members
-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
-        {
+        {
-            strength = TerrainUtil.MetersToSphericalStrength(strength);
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
-            int x, y;
+            int x, y;
-            // Using one 'rain' round for this, so skipping a useless loop
+            // Using one 'rain' round for this, so skipping a useless loop
-            // Will need to adapt back in for the Flood brush
+            // Will need to adapt back in for the Flood brush
-            ITerrainChannel water = new TerrainChannel(map.Width, map.Height);
+            ITerrainChannel water = new TerrainChannel(map.Width, map.Height);
-            ITerrainChannel sediment = new TerrainChannel(map.Width, map.Height);
+            ITerrainChannel sediment = new TerrainChannel(map.Width, map.Height);
-            // Fill with rain
+            // Fill with rain
-            for (x = 0; x < water.Width; x++)
+            for (x = 0; x < water.Width; x++)
-                for (y = 0; y < water.Height; y++)
+                for (y = 0; y < water.Height; y++)
-                    water[x, y] = Math.Max(0.0, TerrainUtil.SphericalFactor(x, y, rx, ry, strength) * rainHeight * duration);
+                    water[x, y] = Math.Max(0.0, TerrainUtil.SphericalFactor(x, y, rx, ry, strength) * rainHeight * duration);
-            for (int i = 0; i < rounds; i++)
+            for (int i = 0; i < rounds; i++)
-            {
+            {
-                // Erode underlying terrain
+                // Erode underlying terrain
-                for (x = 0; x < water.Width; x++)
+                for (x = 0; x < water.Width; x++)
-                {
+                {
-                    for (y = 0; y < water.Height; y++)
+                    for (y = 0; y < water.Height; y++)
-                    {
+                    {
-                        double solConst = (1.0 / rounds);
+                        double solConst = (1.0 / rounds);
-                        double sedDelta = water[x, y] * solConst;
+                        double sedDelta = water[x, y] * solConst;
-                        map[x, y] -= sedDelta;
+                        map[x, y] -= sedDelta;
-                        sediment[x, y] += sedDelta;
+                        sediment[x, y] += sedDelta;
-                    }
+                    }
-                }
+                }
-                // Move water
+                // Move water
-                for (x = 0; x < water.Width; x++)
+                for (x = 0; x < water.Width; x++)
-                {
+                {
-                    for (y = 0; y < water.Height; y++)
+                    for (y = 0; y < water.Height; y++)
-                    {
+                    {
-                        if (water[x, y] <= 0)
+                        if (water[x, y] <= 0)
-                            continue;
+                            continue;
-                        // Step 1. Calculate average of neighbours
+                        // Step 1. Calculate average of neighbours
-                        int neighbours = 0;
+                        int neighbours = 0;
-                        double altitudeTotal = 0.0;
+                        double altitudeTotal = 0.0;
-                        double altitudeMe = map[x, y] + water[x, y];
+                        double altitudeMe = map[x, y] + water[x, y];
-                        int NEIGHBOUR_ME = 4;
+                        int NEIGHBOUR_ME = 4;
-                        int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
+                        int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
-                        for (int j = 0; j < NEIGHBOUR_MAX; j++)
+                        for (int j = 0; j < NEIGHBOUR_MAX; j++)
-                        {
+                        {
-                            if (j != NEIGHBOUR_ME)
+                            if (j != NEIGHBOUR_ME)
-                            {
+                            {
-                                int[] coords = Neighbours(type, j);
+                                int[] coords = Neighbours(type, j);
-                                coords[0] += x;
+                                coords[0] += x;
-                                coords[1] += y;
+                                coords[1] += y;
-                                if (coords[0] > map.Width - 1)
+                                if (coords[0] > map.Width - 1)
-                                    continue;
+                                    continue;
-                                if (coords[1] > map.Height - 1)
+                                if (coords[1] > map.Height - 1)
-                                    continue;
+                                    continue;
-                                if (coords[0] < 0)
+                                if (coords[0] < 0)
-                                    continue;
+                                    continue;
-                                if (coords[1] < 0)
+                                if (coords[1] < 0)
-                                    continue;
+                                    continue;
-                                // Calculate total height of this neighbour
+                                // Calculate total height of this neighbour
-                                double altitudeNeighbour = water[coords[0], coords[1]] + map[coords[0], coords[1]];
+                                double altitudeNeighbour = water[coords[0], coords[1]] + map[coords[0], coords[1]];
-                                // If it's greater than me...
+                                // If it's greater than me...
-                                if (altitudeNeighbour - altitudeMe < 0)
+                                if (altitudeNeighbour - altitudeMe < 0)
-                                {
+                                {
-                                    // Add it to our calculations
+                                    // Add it to our calculations
-                                    neighbours++;
+                                    neighbours++;
-                                    altitudeTotal += altitudeNeighbour;
+                                    altitudeTotal += altitudeNeighbour;
-                                }
+                                }
-                            }
+                            }
-                        }
+                        }
-                        if (neighbours == 0)
+                        if (neighbours == 0)
-                            continue;
+                            continue;
-                        double altitudeAvg = altitudeTotal / neighbours;
+                        double altitudeAvg = altitudeTotal / neighbours;
-                        // Step 2. Allocate water to neighbours.
+                        // Step 2. Allocate water to neighbours.
-                        for (int j = 0; j < NEIGHBOUR_MAX; j++)
+                        for (int j = 0; j < NEIGHBOUR_MAX; j++)
-                        {
+                        {
-                            if (j != NEIGHBOUR_ME)
+                            if (j != NEIGHBOUR_ME)
-                            {
+                            {
-                                int[] coords = Neighbours(type, j);
+                                int[] coords = Neighbours(type, j);
-                                coords[0] += x;
+                                coords[0] += x;
-                                coords[1] += y;
+                                coords[1] += y;
-                                if (coords[0] > map.Width - 1)
+                                if (coords[0] > map.Width - 1)
-                                    continue;
+                                    continue;
-                                if (coords[1] > map.Height - 1)
+                                if (coords[1] > map.Height - 1)
-                                    continue;
+                                    continue;
-                                if (coords[0] < 0)
+                                if (coords[0] < 0)
-                                    continue;
+                                    continue;
-                                if (coords[1] < 0)
+                                if (coords[1] < 0)
-                                    continue;
+                                    continue;
-                                // Skip if we dont have water to begin with.
+                                // Skip if we dont have water to begin with.
-                                if (water[x, y] < 0)
+                                if (water[x, y] < 0)
-                                    continue;
+                                    continue;
-                                // Calculate our delta average
+                                // Calculate our delta average
-                                double altitudeDelta = altitudeMe - altitudeAvg;
+                                double altitudeDelta = altitudeMe - altitudeAvg;
-                                if (altitudeDelta < 0)
+                                if (altitudeDelta < 0)
-                                    continue;
+                                    continue;
-                                // Calculate how much water we can move
+                                // Calculate how much water we can move
-                                double waterMin = Math.Min(water[x, y], altitudeDelta);
+                                double waterMin = Math.Min(water[x, y], altitudeDelta);
-                                double waterDelta = waterMin * ((water[coords[0], coords[1]] + map[coords[0], coords[1]])
+                                double waterDelta = waterMin * ((water[coords[0], coords[1]] + map[coords[0], coords[1]])
-                                                                / altitudeTotal);
+                                                                / altitudeTotal);
-                                double sedimentDelta = sediment[x, y] * (waterDelta / water[x, y]);
+                                double sedimentDelta = sediment[x, y] * (waterDelta / water[x, y]);
-                                if (sedimentDelta > 0)
+                                if (sedimentDelta > 0)
-                                {
+                                {
-                                    sediment[x, y] -= sedimentDelta;
+                                    sediment[x, y] -= sedimentDelta;
-                                    sediment[coords[0], coords[1]] += sedimentDelta;
+                                    sediment[coords[0], coords[1]] += sedimentDelta;
-                                }
+                                }
-                            }
+                            }
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-                // Evaporate
+                // Evaporate
-                for (x = 0; x < water.Width; x++)
+                for (x = 0; x < water.Width; x++)
-                {
+                {
-                    for (y = 0; y < water.Height; y++)
+                    for (y = 0; y < water.Height; y++)
-                    {
+                    {
-                        water[x, y] *= 1.0 - (rainHeight / rounds);
+                        water[x, y] *= 1.0 - (rainHeight / rounds);
-                        double waterCapacity = waterSaturation * water[x, y];
+                        double waterCapacity = waterSaturation * water[x, y];
-                        double sedimentDeposit = sediment[x, y] - waterCapacity;
+                        double sedimentDeposit = sediment[x, y] - waterCapacity;
-                        if (sedimentDeposit > 0)
+                        if (sedimentDeposit > 0)
-                        {
+                        {
-                            sediment[x, y] -= sedimentDeposit;
+                            sediment[x, y] -= sedimentDeposit;
-                            map[x, y] += sedimentDeposit;
+                            map[x, y] += sedimentDeposit;
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-            }
+            }
-            // Deposit any remainder (should be minimal)
+            // Deposit any remainder (should be minimal)
-            for (x = 0; x < water.Width; x++)
+            for (x = 0; x < water.Width; x++)
-                for (y = 0; y < water.Height; y++)
+                for (y = 0; y < water.Height; y++)
-                    if (sediment[x, y] > 0)
+                    if (sediment[x, y] > 0)
-                        map[x, y] += sediment[x, y];
+                        map[x, y] += sediment[x, y];
-        }
+        }
-        #endregion
+        #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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
+{
-    public class FlattenSphere : ITerrainPaintableEffect
+    public class FlattenSphere : ITerrainPaintableEffect
-    {
+    {
-        #region ITerrainPaintableEffect Members
+        #region ITerrainPaintableEffect Members
-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
-        {
+        {
-            strength = TerrainUtil.MetersToSphericalStrength(strength);
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
-            int x, y;
+            int x, y;
-            double[,] tweak = new double[map.Width,map.Height];
+            double[,] tweak = new double[map.Width,map.Height];
-            double area = strength;
+            double area = strength;
-            double step = strength / 4.0;
+            double step = strength / 4.0;
-            double sum = 0.0;
+            double sum = 0.0;
-            double step2 = 0.0;
+            double step2 = 0.0;
-            double avg = 0.0;
+            double avg = 0.0;
-            // compute delta map 
+            // compute delta map 
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    double z = SphericalFactor(x, y, rx, ry, strength);
+                    double z = SphericalFactor(x, y, rx, ry, strength);
-                    if (z > 0) // add in non-zero amount 
+                    if (z > 0) // add in non-zero amount 
-                    {
+                    {
-                        sum += map[x, y] * z;
+                        sum += map[x, y] * z;
-                        step2 += z;
+                        step2 += z;
-                    }
+                    }
-                }
+                }
-            }
+            }
-            avg = sum / step2;
+            avg = sum / step2;
-            // blend in map 
+            // blend in map 
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    double z = SphericalFactor(x, y, rx, ry, strength) * duration;
+                    double z = SphericalFactor(x, y, rx, ry, strength) * duration;
-                    if (z > 0) // add in non-zero amount 
+                    if (z > 0) // add in non-zero amount 
-                    {
+                    {
-                        if (z > 1.0)
+                        if (z > 1.0)
-                            z = 1.0;
+                            z = 1.0;
-                        map[x, y] = (map[x, y] * (1.0 - z)) + (avg * z);
+                        map[x, y] = (map[x, y] * (1.0 - z)) + (avg * z);
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        #endregion
+        #endregion
-        private double SphericalFactor(double x, double y, double rx, double ry, double size)
+        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));
+            double z = size * size - ((x - rx) * (x - rx) + (y - ry) * (y - ry));
-            return z;
+            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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
+{
-    public class LowerSphere : ITerrainPaintableEffect
+    public class LowerSphere : ITerrainPaintableEffect
-    {
+    {
-        #region ITerrainPaintableEffect Members
+        #region ITerrainPaintableEffect Members
-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
-        {
+        {
-            strength = TerrainUtil.MetersToSphericalStrength(strength);
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
-            int x, y;
+            int x, y;
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                // Skip everything unlikely to be affected
+                // Skip everything unlikely to be affected
-                if (Math.Abs(x - rx) > strength * 1.1)
+                if (Math.Abs(x - rx) > strength * 1.1)
-                    continue;
+                    continue;
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    // Skip everything unlikely to be affected
+                    // Skip everything unlikely to be affected
-                    if (Math.Abs(y - ry) > strength * 1.1)
+                    if (Math.Abs(y - ry) > strength * 1.1)
-                        continue;
+                        continue;
-                    // Calculate a sphere and add it to the heighmap
+                    // Calculate a sphere and add it to the heighmap
-                    double z = strength;
+                    double z = strength;
-                    z *= z;
+                    z *= z;
-                    z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
+                    z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
-                    if (z > 0.0)
+                    if (z > 0.0)
-                        map[x, y] -= z * duration;
+                        map[x, y] -= z * duration;
-                }
+                }
-            }
+            }
-        }
+        }
-        #endregion
+        #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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
+{
-    public class NoiseSphere : ITerrainPaintableEffect
+    public class NoiseSphere : ITerrainPaintableEffect
-    {
+    {
-        #region ITerrainPaintableEffect Members
+        #region ITerrainPaintableEffect Members
-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
-        {
+        {
-            strength = TerrainUtil.MetersToSphericalStrength(strength);
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
-            int x, y;
+            int x, y;
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                // Skip everything unlikely to be affected
+                // Skip everything unlikely to be affected
-                if (Math.Abs(x - rx) > strength * 1.1)
+                if (Math.Abs(x - rx) > strength * 1.1)
-                    continue;
+                    continue;
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    // Skip everything unlikely to be affected
+                    // Skip everything unlikely to be affected
-                    if (Math.Abs(y - ry) > strength * 1.1)
+                    if (Math.Abs(y - ry) > strength * 1.1)
-                        continue;
+                        continue;
-                    // Calculate a sphere and add it to the heighmap
+                    // Calculate a sphere and add it to the heighmap
-                    double z = strength;
+                    double z = strength;
-                    z *= z;
+                    z *= z;
-                    z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
+                    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);
+                    double noise = TerrainUtil.PerlinNoise2D((double) x / (double) Constants.RegionSize, (double) y / (double) Constants.RegionSize, 8, 1.0);
-                    if (z > 0.0)
+                    if (z > 0.0)
-                        map[x, y] += noise * z * duration;
+                        map[x, y] += noise * z * duration;
-                }
+                }
-            }
+            }
-        }
+        }
-        #endregion
+        #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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
+{
-    /// <summary>
+    /// <summary>
-    /// Speed-Optimised Hybrid Erosion Brush
+    /// Speed-Optimised Hybrid Erosion Brush
-    /// 
+    /// 
-    /// As per Jacob Olsen's Paper 
+    /// As per Jacob Olsen's Paper 
-    /// http://www.oddlabs.com/download/terrain_generation.pdf
+    /// http://www.oddlabs.com/download/terrain_generation.pdf
-    /// </summary>
+    /// </summary>
-    public class OlsenSphere : ITerrainPaintableEffect
+    public class OlsenSphere : ITerrainPaintableEffect
-    {
+    {
-        private double nConst = 1024.0;
+        private double nConst = 1024.0;
-        private NeighbourSystem type = NeighbourSystem.Moore; // Parameter
+        private NeighbourSystem type = NeighbourSystem.Moore; // Parameter
-        #region Supporting Functions
+        #region Supporting Functions
-        private int[] Neighbours(NeighbourSystem type, int index)
+        private int[] Neighbours(NeighbourSystem type, int index)
-        {
+        {
-            int[] coord = new int[2];
+            int[] coord = new int[2];
-            index++;
+            index++;
-            switch (type)
+            switch (type)
-            {
+            {
-                case NeighbourSystem.Moore:
+                case NeighbourSystem.Moore:
-                    switch (index)
+                    switch (index)
-                    {
+                    {
-                        case 1:
+                        case 1:
-                            coord[0] = -1;
+                            coord[0] = -1;
-                            coord[1] = -1;
+                            coord[1] = -1;
-                            break;
+                            break;
-                        case 2:
+                        case 2:
-                            coord[0] = -0;
+                            coord[0] = -0;
-                            coord[1] = -1;
+                            coord[1] = -1;
-                            break;
+                            break;
-                        case 3:
+                        case 3:
-                            coord[0] = +1;
+                            coord[0] = +1;
-                            coord[1] = -1;
+                            coord[1] = -1;
-                            break;
+                            break;
-                        case 4:
+                        case 4:
-                            coord[0] = -1;
+                            coord[0] = -1;
-                            coord[1] = -0;
+                            coord[1] = -0;
-                            break;
+                            break;
-                        case 5:
+                        case 5:
-                            coord[0] = -0;
+                            coord[0] = -0;
-                            coord[1] = -0;
+                            coord[1] = -0;
-                            break;
+                            break;
-                        case 6:
+                        case 6:
-                            coord[0] = +1;
+                            coord[0] = +1;
-                            coord[1] = -0;
+                            coord[1] = -0;
-                            break;
+                            break;
-                        case 7:
+                        case 7:
-                            coord[0] = -1;
+                            coord[0] = -1;
-                            coord[1] = +1;
+                            coord[1] = +1;
-                            break;
+                            break;
-                        case 8:
+                        case 8:
-                            coord[0] = -0;
+                            coord[0] = -0;
-                            coord[1] = +1;
+                            coord[1] = +1;
-                            break;
+                            break;
-                        case 9:
+                        case 9:
-                            coord[0] = +1;
+                            coord[0] = +1;
-                            coord[1] = +1;
+                            coord[1] = +1;
-                            break;
+                            break;
-                        default:
+                        default:
-                            break;
+                            break;
-                    }
+                    }
-                    break;
+                    break;
-                case NeighbourSystem.VonNeumann:
+                case NeighbourSystem.VonNeumann:
-                    switch (index)
+                    switch (index)
-                    {
+                    {
-                        case 1:
+                        case 1:
-                            coord[0] = 0;
+                            coord[0] = 0;
-                            coord[1] = -1;
+                            coord[1] = -1;
-                            break;
+                            break;
-                        case 2:
+                        case 2:
-                            coord[0] = -1;
+                            coord[0] = -1;
-                            coord[1] = 0;
+                            coord[1] = 0;
-                            break;
+                            break;
-                        case 3:
+                        case 3:
-                            coord[0] = +1;
+                            coord[0] = +1;
-                            coord[1] = 0;
+                            coord[1] = 0;
-                            break;
+                            break;
-                        case 4:
+                        case 4:
-                            coord[0] = 0;
+                            coord[0] = 0;
-                            coord[1] = +1;
+                            coord[1] = +1;
-                            break;
+                            break;
-                        case 5:
+                        case 5:
-                            coord[0] = -0;
+                            coord[0] = -0;
-                            coord[1] = -0;
+                            coord[1] = -0;
-                            break;
+                            break;
-                        default:
+                        default:
-                            break;
+                            break;
-                    }
+                    }
-                    break;
+                    break;
-            }
+            }
-            return coord;
+            return coord;
-        }
+        }
-        private double SphericalFactor(double x, double y, double rx, double ry, double size)
+        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));
+            double z = size * size - ((x - rx) * (x - rx) + (y - ry) * (y - ry));
-            return z;
+            return z;
-        }
+        }
-        private enum NeighbourSystem
+        private enum NeighbourSystem
-        {
+        {
-            Moore,
+            Moore,
-            VonNeumann
+            VonNeumann
-        } ;
+        } ;
-        #endregion
+        #endregion
-        #region ITerrainPaintableEffect Members
+        #region ITerrainPaintableEffect Members
-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
-        {
+        {
-            strength = TerrainUtil.MetersToSphericalStrength(strength);
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
-            int x, y;
+            int x, y;
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    double z = SphericalFactor(x, y, rx, ry, strength);
+                    double z = SphericalFactor(x, y, rx, ry, strength);
-                    if (z > 0) // add in non-zero amount 
+                    if (z > 0) // add in non-zero amount 
-                    {
+                    {
-                        int NEIGHBOUR_ME = 4;
+                        int NEIGHBOUR_ME = 4;
-                        int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
+                        int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
-                        double max = Double.MinValue;
+                        double max = Double.MinValue;
-                        int loc = 0;
+                        int loc = 0;
-                        double cellmax = 0;
+                        double cellmax = 0;
-                        for (int j = 0; j < NEIGHBOUR_MAX; j++)
+                        for (int j = 0; j < NEIGHBOUR_MAX; j++)
-                        {
+                        {
-                            if (j != NEIGHBOUR_ME)
+                            if (j != NEIGHBOUR_ME)
-                            {
+                            {
-                                int[] coords = Neighbours(type, j);
+                                int[] coords = Neighbours(type, j);
-                                coords[0] += x;
+                                coords[0] += x;
-                                coords[1] += y;
+                                coords[1] += y;
-                                if (coords[0] > map.Width - 1)
+                                if (coords[0] > map.Width - 1)
-                                    continue;
+                                    continue;
-                                if (coords[1] > map.Height - 1)
+                                if (coords[1] > map.Height - 1)
-                                    continue;
+                                    continue;
-                                if (coords[0] < 0)
+                                if (coords[0] < 0)
-                                    continue;
+                                    continue;
-                                if (coords[1] < 0)
+                                if (coords[1] < 0)
-                                    continue;
+                                    continue;
-                                cellmax = map[x, y] - map[coords[0], coords[1]];
+                                cellmax = map[x, y] - map[coords[0], coords[1]];
-                                if (cellmax > max)
+                                if (cellmax > max)
-                                {
+                                {
-                                    max = cellmax;
+                                    max = cellmax;
-                                    loc = j;
+                                    loc = j;
-                                }
+                                }
-                            }
+                            }
-                        }
+                        }
-                        double T = nConst / ((map.Width + map.Height) / 2);
+                        double T = nConst / ((map.Width + map.Height) / 2);
-                        // Apply results
+                        // Apply results
-                        if (0 < max && max <= T)
+                        if (0 < max && max <= T)
-                        {
+                        {
-                            int[] maxCoords = Neighbours(type, loc);
+                            int[] maxCoords = Neighbours(type, loc);
-                            double heightDelta = 0.5 * max * z * duration;
+                            double heightDelta = 0.5 * max * z * duration;
-                            map[x, y] -= heightDelta;
+                            map[x, y] -= heightDelta;
-                            map[x + maxCoords[0], y + maxCoords[1]] += heightDelta;
+                            map[x + maxCoords[0], y + maxCoords[1]] += heightDelta;
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        #endregion
+        #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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
+{
-    public class RaiseSphere : ITerrainPaintableEffect
+    public class RaiseSphere : ITerrainPaintableEffect
-    {
+    {
-        #region ITerrainPaintableEffect Members
+        #region ITerrainPaintableEffect Members
-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
-        {
+        {
-            strength = TerrainUtil.MetersToSphericalStrength(strength);
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
-            int x, y;
+            int x, y;
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                // Skip everything unlikely to be affected
+                // Skip everything unlikely to be affected
-                if (Math.Abs(x - rx) > strength * 1.1)
+                if (Math.Abs(x - rx) > strength * 1.1)
-                    continue;
+                    continue;
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    // Skip everything unlikely to be affected
+                    // Skip everything unlikely to be affected
-                    if (Math.Abs(y - ry) > strength * 1.1)
+                    if (Math.Abs(y - ry) > strength * 1.1)
-                        continue;
+                        continue;
-                    // Calculate a sphere and add it to the heighmap
+                    // Calculate a sphere and add it to the heighmap
-                    double z = strength;
+                    double z = strength;
-                    z *= z;
+                    z *= z;
-                    z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
+                    z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
-                    if (z > 0.0)
+                    if (z > 0.0)
-                        map[x, y] += z * duration;
+                        map[x, y] += z * duration;
-                }
+                }
-            }
+            }
-        }
+        }
-        #endregion
+        #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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
+{
-    public class RevertSphere : ITerrainPaintableEffect
+    public class RevertSphere : ITerrainPaintableEffect
-    {
+    {
-        private ITerrainChannel m_revertmap;
+        private ITerrainChannel m_revertmap;
-        public RevertSphere(ITerrainChannel revertmap)
+        public RevertSphere(ITerrainChannel revertmap)
-        {
+        {
-            m_revertmap = revertmap;
+            m_revertmap = revertmap;
-        }
+        }
-        #region ITerrainPaintableEffect Members
+        #region ITerrainPaintableEffect Members
-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
-        {
+        {
-            strength = TerrainUtil.MetersToSphericalStrength(strength);
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
-            if (duration > 1.0)
+            if (duration > 1.0)
-                duration = 1.0;
+                duration = 1.0;
-            if (duration < 0)
+            if (duration < 0)
-                return;
+                return;
-            int x, y;
+            int x, y;
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                // Skip everything unlikely to be affected
+                // Skip everything unlikely to be affected
-                if (Math.Abs(x - rx) > strength * 1.1)
+                if (Math.Abs(x - rx) > strength * 1.1)
-                    continue;
+                    continue;
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    // Skip everything unlikely to be affected
+                    // Skip everything unlikely to be affected
-                    if (Math.Abs(y - ry) > strength * 1.1)
+                    if (Math.Abs(y - ry) > strength * 1.1)
-                        continue;
+                        continue;
-                    // Calculate a sphere and add it to the heighmap
+                    // Calculate a sphere and add it to the heighmap
-                    double z = strength;
+                    double z = strength;
-                    z *= z;
+                    z *= z;
-                    z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
+                    z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
-                    if (z > 0.0)
+                    if (z > 0.0)
-                    {
+                    {
-                        z *= duration;
+                        z *= duration;
-                        map[x, y] += (map[x, y] * (1.0 - z)) + (m_revertmap[x, y] * z);
+                        map[x, y] += (map[x, y] * (1.0 - z)) + (m_revertmap[x, y] * z);
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        #endregion
+        #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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
+{
-    public class SmoothSphere : ITerrainPaintableEffect
+    public class SmoothSphere : ITerrainPaintableEffect
-    {
+    {
-        #region ITerrainPaintableEffect Members
+        #region ITerrainPaintableEffect Members
-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
-        {
+        {
-            strength = TerrainUtil.MetersToSphericalStrength(strength);
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
-            int x, y;
+            int x, y;
-            double[,] tweak = new double[map.Width,map.Height];
+            double[,] tweak = new double[map.Width,map.Height];
-            double n, l;
+            double n, l;
-            double area = strength;
+            double area = strength;
-            double step = strength / 4.0;
+            double step = strength / 4.0;
-            // compute delta map 
+            // compute delta map 
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
+                    double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
-                    if (z > 0) // add in non-zero amount 
+                    if (z > 0) // add in non-zero amount 
-                    {
+                    {
-                        double average = 0.0;
+                        double average = 0.0;
-                        int avgsteps = 0;
+                        int avgsteps = 0;
-                        for (n = 0.0 - area; n < area; n += step)
+                        for (n = 0.0 - area; n < area; n += step)
-                        {
+                        {
-                            for (l = 0.0 - area; l < area; l += step)
+                            for (l = 0.0 - area; l < area; l += step)
-                            {
+                            {
-                                avgsteps++;
+                                avgsteps++;
-                                average += TerrainUtil.GetBilinearInterpolate(x + n, y + l, map);
+                                average += TerrainUtil.GetBilinearInterpolate(x + n, y + l, map);
-                            }
+                            }
-                        }
+                        }
-                        tweak[x, y] = average / avgsteps;
+                        tweak[x, y] = average / avgsteps;
-                    }
+                    }
-                }
+                }
-            }
+            }
-            // blend in map 
+            // blend in map 
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
+                    double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
-                    if (z > 0) // add in non-zero amount 
+                    if (z > 0) // add in non-zero amount 
-                    {
+                    {
-                        double da = z;
+                        double da = z;
-                        double a = (map[x, y] - tweak[x, y]) * da;
+                        double a = (map[x, y] - tweak[x, y]) * da;
-                        double newz = map[x, y] - (a * duration);
+                        double newz = map[x, y] - (a * duration);
-                        if (newz > 0.0)
+                        if (newz > 0.0)
-                            map[x, y] = newz;
+                            map[x, y] = newz;
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        #endregion
+        #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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
+{
-    /// <summary>
+    /// <summary>
-    /// Thermal Weathering Paint Brush
+    /// Thermal Weathering Paint Brush
-    /// </summary>
+    /// </summary>
-    public class WeatherSphere : ITerrainPaintableEffect
+    public class WeatherSphere : ITerrainPaintableEffect
-    {
+    {
-        private double talus = 0.2; // Number of meters max difference before stop eroding. Tweakage required.
+        private double talus = 0.2; // Number of meters max difference before stop eroding. Tweakage required.
-        private NeighbourSystem type = NeighbourSystem.Moore; // Parameter
+        private NeighbourSystem type = NeighbourSystem.Moore; // Parameter
-        #region Supporting Functions
+        #region Supporting Functions
-        private int[] Neighbours(NeighbourSystem type, int index)
+        private int[] Neighbours(NeighbourSystem type, int index)
-        {
+        {
-            int[] coord = new int[2];
+            int[] coord = new int[2];
-            index++;
+            index++;
-            switch (type)
+            switch (type)
-            {
+            {
-                case NeighbourSystem.Moore:
+                case NeighbourSystem.Moore:
-                    switch (index)
+                    switch (index)
-                    {
+                    {
-                        case 1:
+                        case 1:
-                            coord[0] = -1;
+                            coord[0] = -1;
-                            coord[1] = -1;
+                            coord[1] = -1;
-                            break;
+                            break;
-                        case 2:
+                        case 2:
-                            coord[0] = -0;
+                            coord[0] = -0;
-                            coord[1] = -1;
+                            coord[1] = -1;
-                            break;
+                            break;
-                        case 3:
+                        case 3:
-                            coord[0] = +1;
+                            coord[0] = +1;
-                            coord[1] = -1;
+                            coord[1] = -1;
-                            break;
+                            break;
-                        case 4:
+                        case 4:
-                            coord[0] = -1;
+                            coord[0] = -1;
-                            coord[1] = -0;
+                            coord[1] = -0;
-                            break;
+                            break;
-                        case 5:
+                        case 5:
-                            coord[0] = -0;
+                            coord[0] = -0;
-                            coord[1] = -0;
+                            coord[1] = -0;
-                            break;
+                            break;
-                        case 6:
+                        case 6:
-                            coord[0] = +1;
+                            coord[0] = +1;
-                            coord[1] = -0;
+                            coord[1] = -0;
-                            break;
+                            break;
-                        case 7:
+                        case 7:
-                            coord[0] = -1;
+                            coord[0] = -1;
-                            coord[1] = +1;
+                            coord[1] = +1;
-                            break;
+                            break;
-                        case 8:
+                        case 8:
-                            coord[0] = -0;
+                            coord[0] = -0;
-                            coord[1] = +1;
+                            coord[1] = +1;
-                            break;
+                            break;
-                        case 9:
+                        case 9:
-                            coord[0] = +1;
+                            coord[0] = +1;
-                            coord[1] = +1;
+                            coord[1] = +1;
-                            break;
+                            break;
-                        default:
+                        default:
-                            break;
+                            break;
-                    }
+                    }
-                    break;
+                    break;
-                case NeighbourSystem.VonNeumann:
+                case NeighbourSystem.VonNeumann:
-                    switch (index)
+                    switch (index)
-                    {
+                    {
-                        case 1:
+                        case 1:
-                            coord[0] = 0;
+                            coord[0] = 0;
-                            coord[1] = -1;
+                            coord[1] = -1;
-                            break;
+                            break;
-                        case 2:
+                        case 2:
-                            coord[0] = -1;
+                            coord[0] = -1;
-                            coord[1] = 0;
+                            coord[1] = 0;
-                            break;
+                            break;
-                        case 3:
+                        case 3:
-                            coord[0] = +1;
+                            coord[0] = +1;
-                            coord[1] = 0;
+                            coord[1] = 0;
-                            break;
+                            break;
-                        case 4:
+                        case 4:
-                            coord[0] = 0;
+                            coord[0] = 0;
-                            coord[1] = +1;
+                            coord[1] = +1;
-                            break;
+                            break;
-                        case 5:
+                        case 5:
-                            coord[0] = -0;
+                            coord[0] = -0;
-                            coord[1] = -0;
+                            coord[1] = -0;
-                            break;
+                            break;
-                        default:
+                        default:
-                            break;
+                            break;
-                    }
+                    }
-                    break;
+                    break;
-            }
+            }
-            return coord;
+            return coord;
-        }
+        }
-        private enum NeighbourSystem
+        private enum NeighbourSystem
-        {
+        {
-            Moore,
+            Moore,
-            VonNeumann
+            VonNeumann
-        } ;
+        } ;
-        #endregion
+        #endregion
-        #region ITerrainPaintableEffect Members
+        #region ITerrainPaintableEffect Members
-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
-        {
+        {
-            strength = TerrainUtil.MetersToSphericalStrength(strength);
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
-            int x, y;
+            int x, y;
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
+                    double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
-                    if (z > 0) // add in non-zero amount 
+                    if (z > 0) // add in non-zero amount 
-                    {
+                    {
-                        int NEIGHBOUR_ME = 4;
+                        int NEIGHBOUR_ME = 4;
-                        int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
+                        int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
-                        for (int j = 0; j < NEIGHBOUR_MAX; j++)
+                        for (int j = 0; j < NEIGHBOUR_MAX; j++)
-                        {
+                        {
-                            if (j != NEIGHBOUR_ME)
+                            if (j != NEIGHBOUR_ME)
-                            {
+                            {
-                                int[] coords = Neighbours(type, j);
+                                int[] coords = Neighbours(type, j);
-                                coords[0] += x;
+                                coords[0] += x;
-                                coords[1] += y;
+                                coords[1] += y;
-                                if (coords[0] > map.Width - 1)
+                                if (coords[0] > map.Width - 1)
-                                    continue;
+                                    continue;
-                                if (coords[1] > map.Height - 1)
+                                if (coords[1] > map.Height - 1)
-                                    continue;
+                                    continue;
-                                if (coords[0] < 0)
+                                if (coords[0] < 0)
-                                    continue;
+                                    continue;
-                                if (coords[1] < 0)
+                                if (coords[1] < 0)
-                                    continue;
+                                    continue;
-                                double heightF = map[x, y];
+                                double heightF = map[x, y];
-                                double target = map[coords[0], coords[1]];
+                                double target = map[coords[0], coords[1]];
-                                if (target > heightF + talus)
+                                if (target > heightF + talus)
-                                {
+                                {
-                                    double calc = duration * ((target - heightF) - talus) * z;
+                                    double calc = duration * ((target - heightF) - talus) * z;
-                                    heightF += calc;
+                                    heightF += calc;
-                                    target -= calc;
+                                    target -= calc;
-                                }
+                                }
-                                map[x, y] = heightF;
+                                map[x, y] = heightF;
-                                map[coords[0], coords[1]] = target;
+                                map[coords[0], coords[1]] = target;
-                            }
+                            }
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        #endregion
+        #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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain
+namespace OpenSim.Region.Environment.Modules.World.Terrain
-{
+{
-    /// <summary>
+    /// <summary>
-    /// A new version of the old Channel class, simplified
+    /// A new version of the old Channel class, simplified
-    /// </summary>
+    /// </summary>
-    public class TerrainChannel : ITerrainChannel
+    public class TerrainChannel : ITerrainChannel
-    {
+    {
-        private readonly bool[,] taint;
+        private readonly bool[,] taint;
-        private double[,] map;
+        private double[,] map;
-        public TerrainChannel()
+        public TerrainChannel()
-        {
+        {
-            map = new double[Constants.RegionSize,Constants.RegionSize];
+            map = new double[Constants.RegionSize,Constants.RegionSize];
-            taint = new bool[Constants.RegionSize / 16,Constants.RegionSize / 16];
+            taint = new bool[Constants.RegionSize / 16,Constants.RegionSize / 16];
-            int x;
+            int x;
-            for (x = 0; x < Constants.RegionSize; x++)
+            for (x = 0; x < Constants.RegionSize; x++)
-            {
+            {
-                int y;
+                int y;
-                for (y = 0; y < Constants.RegionSize; y++)
+                for (y = 0; y < Constants.RegionSize; y++)
-                {
+                {
-                    map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 10;
+                    map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 10;
-                    double spherFac = TerrainUtil.SphericalFactor(x, y, Constants.RegionSize / 2, Constants.RegionSize / 2, 50) * 0.01;
+                    double spherFac = TerrainUtil.SphericalFactor(x, y, Constants.RegionSize / 2, Constants.RegionSize / 2, 50) * 0.01;
-                    if (map[x, y] < spherFac)
+                    if (map[x, y] < spherFac)
-                    {
+                    {
-                        map[x, y] = spherFac;
+                        map[x, y] = spherFac;
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        public TerrainChannel(double[,] import)
+        public TerrainChannel(double[,] import)
-        {
+        {
-            map = import;
+            map = import;
-            taint = new bool[import.GetLength(0),import.GetLength(1)];
+            taint = new bool[import.GetLength(0),import.GetLength(1)];
-        }
+        }
-        public TerrainChannel(bool createMap)
+        public TerrainChannel(bool createMap)
-        {
+        {
-            if (createMap)
+            if (createMap)
-            {
+            {
-                map = new double[Constants.RegionSize,Constants.RegionSize];
+                map = new double[Constants.RegionSize,Constants.RegionSize];
-                taint = new bool[Constants.RegionSize / 16,Constants.RegionSize / 16];
+                taint = new bool[Constants.RegionSize / 16,Constants.RegionSize / 16];
-            }
+            }
-        }
+        }
-        public TerrainChannel(int w, int h)
+        public TerrainChannel(int w, int h)
-        {
+        {
-            map = new double[w,h];
+            map = new double[w,h];
-            taint = new bool[w / 16,h / 16];
+            taint = new bool[w / 16,h / 16];
-        }
+        }
-        #region ITerrainChannel Members
+        #region ITerrainChannel Members
-        public int Width
+        public int Width
-        {
+        {
-            get { return map.GetLength(0); }
+            get { return map.GetLength(0); }
-        }
+        }
-        public int Height
+        public int Height
-        {
+        {
-            get { return map.GetLength(1); }
+            get { return map.GetLength(1); }
-        }
+        }
-        public ITerrainChannel MakeCopy()
+        public ITerrainChannel MakeCopy()
-        {
+        {
-            TerrainChannel copy = new TerrainChannel(false);
+            TerrainChannel copy = new TerrainChannel(false);
-            copy.map = (double[,]) map.Clone();
+            copy.map = (double[,]) map.Clone();
-            return copy;
+            return copy;
-        }
+        }
-        public float[] GetFloatsSerialised()
+        public float[] GetFloatsSerialised()
-        {
+        {
-            float[] heights = new float[Width * Height];
+            float[] heights = new float[Width * Height];
-            int i;
+            int i;
-            for (i = 0; i < Width * Height; i++)
+            for (i = 0; i < Width * Height; i++)
-            {
+            {
-                heights[i] = (float) map[i % Width, i / Width];
+                heights[i] = (float) map[i % Width, i / Width];
-            }
+            }
-            return heights;
+            return heights;
-        }
+        }
-        public double[,] GetDoubles()
+        public double[,] GetDoubles()
-        {
+        {
-            return map;
+            return map;
-        }
+        }
-        public double this[int x, int y]
+        public double this[int x, int y]
-        {
+        {
-            get { return map[x, y]; }
+            get { return map[x, y]; }
-            set
+            set
-            {
+            {
-                if (map[x, y] != value)
+                if (map[x, y] != value)
-                {
+                {
-                    taint[x / 16, y / 16] = true;
+                    taint[x / 16, y / 16] = true;
-                    map[x, y] = value;
+                    map[x, y] = value;
-                }
+                }
-            }
+            }
-        }
+        }
-        public bool Tainted(int x, int y)
+        public bool Tainted(int x, int y)
-        {
+        {
-            if (taint[x / 16, y / 16])
+            if (taint[x / 16, y / 16])
-            {
+            {
-                taint[x / 16, y / 16] = false;
+                taint[x / 16, y / 16] = false;
-                return true;
+                return true;
-            }
+            }
-            else
+            else
-            {
+            {
-                return false;
+                return false;
-            }
+            }
-        }
+        }
-        #endregion
+        #endregion
-        public TerrainChannel Copy()
+        public TerrainChannel Copy()
-        {
+        {
-            TerrainChannel copy = new TerrainChannel(false);
+            TerrainChannel copy = new TerrainChannel(false);
-            copy.map = (double[,]) map.Clone();
+            copy.map = (double[,]) map.Clone();
-            return copy;
+            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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-namespace OpenSim.Region.Environment.Modules.World.Terrain
+namespace OpenSim.Region.Environment.Modules.World.Terrain
-{
+{
-    public class TerrainException : Exception
+    public class TerrainException : Exception
-    {
+    {
-        public TerrainException() : base()
+        public TerrainException() : base()
-        {
+        {
-        }
+        }
-        public TerrainException(string msg) : base(msg)
+        public TerrainException(string msg) : base(msg)
-        {
+        {
-        }
+        }
-        public TerrainException(string msg, Exception e) : base(msg, e)
+        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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using System.Reflection;
+using System.Reflection;
-using libsecondlife;
+using libsecondlife;
-using log4net;
+using log4net;
-using Nini.Config;
+using Nini.Config;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Modules.Framework;
+using OpenSim.Region.Environment.Modules.Framework;
-using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;
+using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;
-using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes;
+using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes;
-using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
+using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules.World.Terrain
+namespace OpenSim.Region.Environment.Modules.World.Terrain
-{
+{
-    public class TerrainModule : IRegionModule, ICommandableModule, ITerrainModule
+    public class TerrainModule : IRegionModule, ICommandableModule, ITerrainModule
-    {
+    {
-        #region StandardTerrainEffects enum
+        #region StandardTerrainEffects enum
-        /// <summary>
+        /// <summary>
-        /// A standard set of terrain brushes and effects recognised by viewers
+        /// A standard set of terrain brushes and effects recognised by viewers
-        /// </summary>
+        /// </summary>
-        public enum StandardTerrainEffects : byte
+        public enum StandardTerrainEffects : byte
-        {
+        {
-            Flatten = 0,
+            Flatten = 0,
-            Raise = 1,
+            Raise = 1,
-            Lower = 2,
+            Lower = 2,
-            Smooth = 3,
+            Smooth = 3,
-            Noise = 4,
+            Noise = 4,
-            Revert = 5,
+            Revert = 5,
-            // Extended brushes
+            // Extended brushes
-            Erode = 255,
+            Erode = 255,
-            Weather = 254,
+            Weather = 254,
-            Olsen = 253
+            Olsen = 253
-        }
+        }
-        #endregion
+        #endregion
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private readonly Commander m_commander = new Commander("Terrain");
+        private readonly Commander m_commander = new Commander("Terrain");
-        private readonly Dictionary<StandardTerrainEffects, ITerrainFloodEffect> m_floodeffects =
+        private readonly Dictionary<StandardTerrainEffects, ITerrainFloodEffect> m_floodeffects =
-            new Dictionary<StandardTerrainEffects, ITerrainFloodEffect>();
+            new Dictionary<StandardTerrainEffects, ITerrainFloodEffect>();
-        private readonly Dictionary<string, ITerrainLoader> m_loaders = new Dictionary<string, ITerrainLoader>();
+        private readonly Dictionary<string, ITerrainLoader> m_loaders = new Dictionary<string, ITerrainLoader>();
-        private readonly Dictionary<StandardTerrainEffects, ITerrainPaintableEffect> m_painteffects =
+        private readonly Dictionary<StandardTerrainEffects, ITerrainPaintableEffect> m_painteffects =
-            new Dictionary<StandardTerrainEffects, ITerrainPaintableEffect>();
+            new Dictionary<StandardTerrainEffects, ITerrainPaintableEffect>();
-        private ITerrainChannel m_channel;
+        private ITerrainChannel m_channel;
-        private Dictionary<Location, ITerrainChannel> m_channels;
+        private Dictionary<Location, ITerrainChannel> m_channels;
-        private Dictionary<string, ITerrainEffect> m_plugineffects;
+        private Dictionary<string, ITerrainEffect> m_plugineffects;
-        private ITerrainChannel m_revert;
+        private ITerrainChannel m_revert;
-        private Scene m_scene;
+        private Scene m_scene;
-        private bool m_tainted = false;
+        private bool m_tainted = false;
-        #region ICommandableModule Members
+        #region ICommandableModule Members
-        public ICommander CommandInterface
+        public ICommander CommandInterface
-        {
+        {
-            get { return m_commander; }
+            get { return m_commander; }
-        }
+        }
-        #endregion
+        #endregion
-        #region IRegionModule Members
+        #region IRegionModule Members
-        /// <summary>
+        /// <summary>
-        /// Creates and initialises a terrain module for a region
+        /// Creates and initialises a terrain module for a region
-        /// </summary>
+        /// </summary>
-        /// <param name="scene">Region initialising</param>
+        /// <param name="scene">Region initialising</param>
-        /// <param name="config">Config for the region</param>
+        /// <param name="config">Config for the region</param>
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(Scene scene, IConfigSource config)
-        {
+        {
-            m_scene = scene;
+            m_scene = scene;
-            // Install terrain module in the simulator
+            // Install terrain module in the simulator
-            if (m_scene.Heightmap == null)
+            if (m_scene.Heightmap == null)
-            {
+            {
-                lock (m_scene)
+                lock (m_scene)
-                {
+                {
-                    m_channel = new TerrainChannel();
+                    m_channel = new TerrainChannel();
-                    m_scene.Heightmap = m_channel;
+                    m_scene.Heightmap = m_channel;
-                    m_revert = new TerrainChannel();
+                    m_revert = new TerrainChannel();
-                    UpdateRevertMap();
+                    UpdateRevertMap();
-                }
+                }
-            }
+            }
-            else
+            else
-            {
+            {
-                m_channel = m_scene.Heightmap;
+                m_channel = m_scene.Heightmap;
-                m_revert = new TerrainChannel();
+                m_revert = new TerrainChannel();
-                UpdateRevertMap();
+                UpdateRevertMap();
-            }
+            }
-            m_scene.RegisterModuleInterface<ITerrainModule>(this);
+            m_scene.RegisterModuleInterface<ITerrainModule>(this);
-            m_scene.EventManager.OnNewClient += EventManager_OnNewClient;
+            m_scene.EventManager.OnNewClient += EventManager_OnNewClient;
-            m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
+            m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
-            m_scene.EventManager.OnTerrainTick += EventManager_OnTerrainTick;
+            m_scene.EventManager.OnTerrainTick += EventManager_OnTerrainTick;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Enables terrain module when called
+        /// Enables terrain module when called
-        /// </summary>
+        /// </summary>
-        public void PostInitialise()
+        public void PostInitialise()
-        {
+        {
-            InstallDefaultEffects();
+            InstallDefaultEffects();
-            InstallInterfaces();
+            InstallInterfaces();
-            LoadPlugins();
+            LoadPlugins();
-        }
+        }
-        public void Close()
+        public void Close()
-        {
+        {
-        }
+        }
-        public string Name
+        public string Name
-        {
+        {
-            get { return "TerrainModule"; }
+            get { return "TerrainModule"; }
-        }
+        }
-        public bool IsSharedModule
+        public bool IsSharedModule
-        {
+        {
-            get { return false; }
+            get { return false; }
-        }
+        }
-        #endregion
+        #endregion
-        #region ITerrainModule Members
+        #region ITerrainModule Members
-        /// <summary>
+        /// <summary>
-        /// Loads a terrain file from disk and installs it in the scene.
+        /// Loads a terrain file from disk and installs it in the scene.
-        /// </summary>
+        /// </summary>
-        /// <param name="filename">Filename to terrain file. Type is determined by extension.</param>
+        /// <param name="filename">Filename to terrain file. Type is determined by extension.</param>
-        public void LoadFromFile(string filename)
+        public void LoadFromFile(string filename)
-        {
+        {
-            foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
+            foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
-            {
+            {
-                if (filename.EndsWith(loader.Key))
+                if (filename.EndsWith(loader.Key))
-                {
+                {
-                    lock (m_scene)
+                    lock (m_scene)
-                    {
+                    {
-                        try
+                        try
-                        {
+                        {
-                            ITerrainChannel channel = loader.Value.LoadFile(filename);
+                            ITerrainChannel channel = loader.Value.LoadFile(filename);
-                            m_scene.Heightmap = channel;
+                            m_scene.Heightmap = channel;
-                            m_channel = channel;
+                            m_channel = channel;
-                            UpdateRevertMap();
+                            UpdateRevertMap();
-                        }
+                        }
-                        catch (NotImplementedException)
+                        catch (NotImplementedException)
-                        {
+                        {
-                            m_log.Error("[TERRAIN]: Unable to load heightmap, the " + loader.Value +
+                            m_log.Error("[TERRAIN]: Unable to load heightmap, the " + loader.Value +
-                                        " parser does not support file loading. (May be save only)");
+                                        " 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));
+                            throw new TerrainException(String.Format("unable to load heightmap: parser {0} does not support loading", loader.Value));
-                        }
+                        }
-                        catch (FileNotFoundException)
+                        catch (FileNotFoundException)
-                        {
+                        {
-                            m_log.Error(
+                            m_log.Error(
-                                "[TERRAIN]: Unable to load heightmap, file not found. (A directory permissions error may also cause this)");
+                                "[TERRAIN]: Unable to load heightmap, file not found. (A directory permissions error may also cause this)");
-                            throw new TerrainException(
+                            throw new TerrainException(
-                                String.Format("unable to load heightmap: file {0} not found (or permissions do not allow access", filename));
+                                String.Format("unable to load heightmap: file {0} not found (or permissions do not allow access", filename));
-                        }
+                        }
-                    }
+                    }
-                    CheckForTerrainUpdates();
+                    CheckForTerrainUpdates();
-                    m_log.Info("[TERRAIN]: File (" + filename + ") loaded successfully");
+                    m_log.Info("[TERRAIN]: File (" + filename + ") loaded successfully");
-                    return;
+                    return;
-                }
+                }
-            }
+            }
-            m_log.Error("[TERRAIN]: Unable to load heightmap, no file loader availible for that format.");
+            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));
+            throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename));
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Saves the current heightmap to a specified file.
+        /// Saves the current heightmap to a specified file.
-        /// </summary>
+        /// </summary>
-        /// <param name="filename">The destination filename</param>
+        /// <param name="filename">The destination filename</param>
-        public void SaveToFile(string filename)
+        public void SaveToFile(string filename)
-        {
+        {
-            try
+            try
-            {
+            {
-                foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
+                foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
-                {
+                {
-                    if (filename.EndsWith(loader.Key))
+                    if (filename.EndsWith(loader.Key))
-                    {
+                    {
-                        loader.Value.SaveFile(filename, m_channel);
+                        loader.Value.SaveFile(filename, m_channel);
-                        return;
+                        return;
-                    }
+                    }
-                }
+                }
-            }
+            }
-            catch (NotImplementedException)
+            catch (NotImplementedException)
-            {
+            {
-                m_log.Error("Unable to save to " + filename + ", saving of this file format has not been implemented.");
+                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"));
+                throw new TerrainException(String.Format("Unable to save heightmap: saving of this file format not implemented"));
-            }
+            }
-        }
+        }
-        #region Plugin Loading Methods
+        #region Plugin Loading Methods
-        private void LoadPlugins()
+        private void LoadPlugins()
-        {
+        {
-            m_plugineffects = new Dictionary<string, ITerrainEffect>();
+            m_plugineffects = new Dictionary<string, ITerrainEffect>();
-            // Load the files in the Terrain/ dir
+            // Load the files in the Terrain/ dir
-            string[] files = Directory.GetFiles("Terrain");
+            string[] files = Directory.GetFiles("Terrain");
-            foreach (string file in files)
+            foreach (string file in files)
-            {
+            {
-                m_log.Info("Loading effects in " + file);
+                m_log.Info("Loading effects in " + file);
-                try
+                try
-                {
+                {
-                    Assembly library = Assembly.LoadFrom(file);
+                    Assembly library = Assembly.LoadFrom(file);
-                    foreach (Type pluginType in library.GetTypes())
+                    foreach (Type pluginType in library.GetTypes())
-                    {
+                    {
-                        try
+                        try
-                        {
+                        {
-                            if (pluginType.IsAbstract || pluginType.IsNotPublic)
+                            if (pluginType.IsAbstract || pluginType.IsNotPublic)
-                                continue;
+                                continue;
-                            if (pluginType.GetInterface("ITerrainEffect", false) != null)
+                            if (pluginType.GetInterface("ITerrainEffect", false) != null)
-                            {
+                            {
-                                ITerrainEffect terEffect = (ITerrainEffect) Activator.CreateInstance(library.GetType(pluginType.ToString()));
+                                ITerrainEffect terEffect = (ITerrainEffect) Activator.CreateInstance(library.GetType(pluginType.ToString()));
-                                if (!m_plugineffects.ContainsKey(pluginType.Name))
+                                if (!m_plugineffects.ContainsKey(pluginType.Name))
-                                {
+                                {
-                                    m_plugineffects.Add(pluginType.Name, terEffect);
+                                    m_plugineffects.Add(pluginType.Name, terEffect);
-                                    m_log.Info("E ... " + pluginType.Name);
+                                    m_log.Info("E ... " + pluginType.Name);
-                                }
+                                }
-                                else
+                                else
-                                {
+                                {
-                                    m_log.Warn("E ... " + pluginType.Name + " (Already added)");
+                                    m_log.Warn("E ... " + pluginType.Name + " (Already added)");
-                                }
+                                }
-                            }
+                            }
-                            else if (pluginType.GetInterface("ITerrainLoader", false) != null)
+                            else if (pluginType.GetInterface("ITerrainLoader", false) != null)
-                            {
+                            {
-                                ITerrainLoader terLoader = (ITerrainLoader) Activator.CreateInstance(library.GetType(pluginType.ToString()));
+                                ITerrainLoader terLoader = (ITerrainLoader) Activator.CreateInstance(library.GetType(pluginType.ToString()));
-                                m_loaders[terLoader.FileExtension] = terLoader;
+                                m_loaders[terLoader.FileExtension] = terLoader;
-                                m_log.Info("L ... " + pluginType.Name);
+                                m_log.Info("L ... " + pluginType.Name);
-                            }
+                            }
-                        }
+                        }
-                        catch (AmbiguousMatchException)
+                        catch (AmbiguousMatchException)
-                        {
+                        {
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-                catch (BadImageFormatException)
+                catch (BadImageFormatException)
-                {
+                {
-                }
+                }
-            }
+            }
-        }
+        }
-        #endregion
+        #endregion
-        #endregion
+        #endregion
-        /// <summary>
+        /// <summary>
-        /// Installs into terrain module the standard suite of brushes
+        /// Installs into terrain module the standard suite of brushes
-        /// </summary>
+        /// </summary>
-        private void InstallDefaultEffects()
+        private void InstallDefaultEffects()
-        {
+        {
-            // Draggable Paint Brush Effects
+            // Draggable Paint Brush Effects
-            m_painteffects[StandardTerrainEffects.Raise] = new RaiseSphere();
+            m_painteffects[StandardTerrainEffects.Raise] = new RaiseSphere();
-            m_painteffects[StandardTerrainEffects.Lower] = new LowerSphere();
+            m_painteffects[StandardTerrainEffects.Lower] = new LowerSphere();
-            m_painteffects[StandardTerrainEffects.Smooth] = new SmoothSphere();
+            m_painteffects[StandardTerrainEffects.Smooth] = new SmoothSphere();
-            m_painteffects[StandardTerrainEffects.Noise] = new NoiseSphere();
+            m_painteffects[StandardTerrainEffects.Noise] = new NoiseSphere();
-            m_painteffects[StandardTerrainEffects.Flatten] = new FlattenSphere();
+            m_painteffects[StandardTerrainEffects.Flatten] = new FlattenSphere();
-            m_painteffects[StandardTerrainEffects.Revert] = new RevertSphere(m_revert);
+            m_painteffects[StandardTerrainEffects.Revert] = new RevertSphere(m_revert);
-            m_painteffects[StandardTerrainEffects.Erode] = new ErodeSphere();
+            m_painteffects[StandardTerrainEffects.Erode] = new ErodeSphere();
-            m_painteffects[StandardTerrainEffects.Weather] = new WeatherSphere();
+            m_painteffects[StandardTerrainEffects.Weather] = new WeatherSphere();
-            m_painteffects[StandardTerrainEffects.Olsen] = new OlsenSphere();
+            m_painteffects[StandardTerrainEffects.Olsen] = new OlsenSphere();
-            // Area of effect selection effects
+            // Area of effect selection effects
-            m_floodeffects[StandardTerrainEffects.Raise] = new RaiseArea();
+            m_floodeffects[StandardTerrainEffects.Raise] = new RaiseArea();
-            m_floodeffects[StandardTerrainEffects.Lower] = new LowerArea();
+            m_floodeffects[StandardTerrainEffects.Lower] = new LowerArea();
-            m_floodeffects[StandardTerrainEffects.Smooth] = new SmoothArea();
+            m_floodeffects[StandardTerrainEffects.Smooth] = new SmoothArea();
-            m_floodeffects[StandardTerrainEffects.Noise] = new NoiseArea();
+            m_floodeffects[StandardTerrainEffects.Noise] = new NoiseArea();
-            m_floodeffects[StandardTerrainEffects.Flatten] = new FlattenArea();
+            m_floodeffects[StandardTerrainEffects.Flatten] = new FlattenArea();
-            m_floodeffects[StandardTerrainEffects.Revert] = new RevertArea(m_revert);
+            m_floodeffects[StandardTerrainEffects.Revert] = new RevertArea(m_revert);
-            // Filesystem load/save loaders
+            // Filesystem load/save loaders
-            m_loaders[".r32"] = new RAW32();
+            m_loaders[".r32"] = new RAW32();
-            m_loaders[".f32"] = m_loaders[".r32"];
+            m_loaders[".f32"] = m_loaders[".r32"];
-            m_loaders[".ter"] = new Terragen();
+            m_loaders[".ter"] = new Terragen();
-            m_loaders[".raw"] = new LLRAW();
+            m_loaders[".raw"] = new LLRAW();
-            m_loaders[".jpg"] = new JPEG();
+            m_loaders[".jpg"] = new JPEG();
-            m_loaders[".jpeg"] = m_loaders[".jpg"];
+            m_loaders[".jpeg"] = m_loaders[".jpg"];
-            m_loaders[".bmp"] = new BMP();
+            m_loaders[".bmp"] = new BMP();
-            m_loaders[".png"] = new PNG();
+            m_loaders[".png"] = new PNG();
-            m_loaders[".gif"] = new GIF();
+            m_loaders[".gif"] = new GIF();
-            m_loaders[".tif"] = new TIFF();
+            m_loaders[".tif"] = new TIFF();
-            m_loaders[".tiff"] = m_loaders[".tif"];
+            m_loaders[".tiff"] = m_loaders[".tif"];
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Saves the current state of the region into the revert map buffer.
+        /// Saves the current state of the region into the revert map buffer.
-        /// </summary>
+        /// </summary>
-        public void UpdateRevertMap()
+        public void UpdateRevertMap()
-        {
+        {
-            int x;
+            int x;
-            for (x = 0; x < m_channel.Width; x++)
+            for (x = 0; x < m_channel.Width; x++)
-            {
+            {
-                int y;
+                int y;
-                for (y = 0; y < m_channel.Height; y++)
+                for (y = 0; y < m_channel.Height; y++)
-                {
+                {
-                    m_revert[x, y] = m_channel[x, y];
+                    m_revert[x, y] = m_channel[x, y];
-                }
+                }
-            }
+            }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Loads a tile from a larger terrain file and installs it into the region.
+        /// Loads a tile from a larger terrain file and installs it into the region.
-        /// </summary>
+        /// </summary>
-        /// <param name="filename">The terrain file to load</param>
+        /// <param name="filename">The terrain file to load</param>
-        /// <param name="fileWidth">The width of the file in units</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="fileHeight">The height of the file in units</param>
-        /// <param name="fileStartX">Where to begin our slice</param>
+        /// <param name="fileStartX">Where to begin our slice</param>
-        /// <param name="fileStartY">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)
+        public void LoadFromFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY)
-        {
+        {
-            int offsetX = (int) m_scene.RegionInfo.RegionLocX - fileStartX;
+            int offsetX = (int) m_scene.RegionInfo.RegionLocX - fileStartX;
-            int offsetY = (int) m_scene.RegionInfo.RegionLocY - fileStartY;
+            int offsetY = (int) m_scene.RegionInfo.RegionLocY - fileStartY;
-            if (offsetX >= 0 && offsetX < fileWidth && offsetY >= 0 && offsetY < fileHeight)
+            if (offsetX >= 0 && offsetX < fileWidth && offsetY >= 0 && offsetY < fileHeight)
-            {
+            {
-                // this region is included in the tile request
+                // this region is included in the tile request
-                foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
+                foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
-                {
+                {
-                    if (filename.EndsWith(loader.Key))
+                    if (filename.EndsWith(loader.Key))
-                    {
+                    {
-                        lock (m_scene)
+                        lock (m_scene)
-                        {
+                        {
-                            ITerrainChannel channel = loader.Value.LoadFile(filename, offsetX, offsetY,
+                            ITerrainChannel channel = loader.Value.LoadFile(filename, offsetX, offsetY,
-                                                                            fileWidth, fileHeight,
+                                                                            fileWidth, fileHeight,
-                                                                            (int) Constants.RegionSize,
+                                                                            (int) Constants.RegionSize,
-                                                                            (int) Constants.RegionSize);
+                                                                            (int) Constants.RegionSize);
-                            m_scene.Heightmap = channel;
+                            m_scene.Heightmap = channel;
-                            m_channel = channel;
+                            m_channel = channel;
-                            UpdateRevertMap();
+                            UpdateRevertMap();
-                        }
+                        }
-                        return;
+                        return;
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Performs updates to the region periodically, synchronising physics and other heightmap aware sections
+        /// Performs updates to the region periodically, synchronising physics and other heightmap aware sections
-        /// </summary>
+        /// </summary>
-        private void EventManager_OnTerrainTick()
+        private void EventManager_OnTerrainTick()
-        {
+        {
-            if (m_tainted)
+            if (m_tainted)
-            {
+            {
-                m_tainted = false;
+                m_tainted = false;
-                m_scene.PhysicsScene.SetTerrain(m_channel.GetFloatsSerialised());
+                m_scene.PhysicsScene.SetTerrain(m_channel.GetFloatsSerialised());
-                m_scene.SaveTerrain();
+                m_scene.SaveTerrain();
-                m_scene.CreateTerrainTexture(true);
+                m_scene.CreateTerrainTexture(true);
-            }
+            }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Processes commandline input. Do not call directly.
+        /// Processes commandline input. Do not call directly.
-        /// </summary>
+        /// </summary>
-        /// <param name="args">Commandline arguments</param>
+        /// <param name="args">Commandline arguments</param>
-        private void EventManager_OnPluginConsole(string[] args)
+        private void EventManager_OnPluginConsole(string[] args)
-        {
+        {
-            if (args[0] == "terrain")
+            if (args[0] == "terrain")
-            {
+            {
-                string[] tmpArgs = new string[args.Length - 2];
+                string[] tmpArgs = new string[args.Length - 2];
-                int i;
+                int i;
-                for (i = 2; i < args.Length; i++)
+                for (i = 2; i < args.Length; i++)
-                    tmpArgs[i - 2] = args[i];
+                    tmpArgs[i - 2] = args[i];
-                m_commander.ProcessConsoleCommand(args[1], tmpArgs);
+                m_commander.ProcessConsoleCommand(args[1], tmpArgs);
-            }
+            }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Installs terrain brush hook to IClientAPI
+        /// Installs terrain brush hook to IClientAPI
-        /// </summary>
+        /// </summary>
-        /// <param name="client"></param>
+        /// <param name="client"></param>
-        private void EventManager_OnNewClient(IClientAPI client)
+        private void EventManager_OnNewClient(IClientAPI client)
-        {
+        {
-            client.OnModifyTerrain += client_OnModifyTerrain;
+            client.OnModifyTerrain += client_OnModifyTerrain;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Checks to see if the terrain has been modified since last check
+        /// Checks to see if the terrain has been modified since last check
-        /// </summary>
+        /// </summary>
-        private void CheckForTerrainUpdates()
+        private void CheckForTerrainUpdates()
-        {
+        {
-            bool shouldTaint = false;
+            bool shouldTaint = false;
-            float[] serialised = m_channel.GetFloatsSerialised();
+            float[] serialised = m_channel.GetFloatsSerialised();
-            int x;
+            int x;
-            for (x = 0; x < m_channel.Width; x += Constants.TerrainPatchSize)
+            for (x = 0; x < m_channel.Width; x += Constants.TerrainPatchSize)
-            {
+            {
-                int y;
+                int y;
-                for (y = 0; y < m_channel.Height; y += Constants.TerrainPatchSize)
+                for (y = 0; y < m_channel.Height; y += Constants.TerrainPatchSize)
-                {
+                {
-                    if (m_channel.Tainted(x, y))
+                    if (m_channel.Tainted(x, y))
-                    {
+                    {
-                        SendToClients(serialised, x, y);
+                        SendToClients(serialised, x, y);
-                        shouldTaint = true;
+                        shouldTaint = true;
-                    }
+                    }
-                }
+                }
-            }
+            }
-            if (shouldTaint)
+            if (shouldTaint)
-            {
+            {
-                m_tainted = true;
+                m_tainted = true;
-            }
+            }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Sends a copy of the current terrain to the scenes clients
+        /// Sends a copy of the current terrain to the scenes clients
-        /// </summary>
+        /// </summary>
-        /// <param name="serialised">A copy of the terrain as a 1D float array of size w*h</param>
+        /// <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="x">The patch corner to send</param>
-        /// <param name="y">The patch corner to send</param>
+        /// <param name="y">The patch corner to send</param>
-        private void SendToClients(float[] serialised, int x, int y)
+        private void SendToClients(float[] serialised, int x, int y)
-        {
+        {
-            m_scene.ForEachClient(
+            m_scene.ForEachClient(
-                delegate(IClientAPI controller) { controller.SendLayerData(x / Constants.TerrainPatchSize, y / Constants.TerrainPatchSize, serialised); });
+                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,
+        private void client_OnModifyTerrain(float height, float seconds, byte size, byte action, float north, float west,
-                                            float south, float east, IClientAPI remoteClient)
+                                            float south, float east, IClientAPI remoteClient)
-        {
+        {
-            // Not a good permissions check, if in area mode, need to check the entire area.
+            // 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 (m_scene.PermissionsMngr.CanTerraform(remoteClient.AgentId, new LLVector3(north, west, 0)))
-            {
+            {
-                if (north == south && east == west)
+                if (north == south && east == west)
-                {
+                {
-                    if (m_painteffects.ContainsKey((StandardTerrainEffects) action))
+                    if (m_painteffects.ContainsKey((StandardTerrainEffects) action))
-                    {
+                    {
-                        m_painteffects[(StandardTerrainEffects) action].PaintEffect(
+                        m_painteffects[(StandardTerrainEffects) action].PaintEffect(
-                            m_channel, west, south, size, seconds);
+                            m_channel, west, south, size, seconds);
-                        CheckForTerrainUpdates();
+                        CheckForTerrainUpdates();
-                    }
+                    }
-                    else
+                    else
-                    {
+                    {
-                        m_log.Debug("Unknown terrain brush type " + action);
+                        m_log.Debug("Unknown terrain brush type " + action);
-                    }
+                    }
-                }
+                }
-                else
+                else
-                {
+                {
-                    if (m_floodeffects.ContainsKey((StandardTerrainEffects) action))
+                    if (m_floodeffects.ContainsKey((StandardTerrainEffects) action))
-                    {
+                    {
-                        bool[,] fillArea = new bool[m_channel.Width,m_channel.Height];
+                        bool[,] fillArea = new bool[m_channel.Width,m_channel.Height];
-                        fillArea.Initialize();
+                        fillArea.Initialize();
-                        int x;
+                        int x;
-                        for (x = 0; x < m_channel.Width; x++)
+                        for (x = 0; x < m_channel.Width; x++)
-                        {
+                        {
-                            int y;
+                            int y;
-                            for (y = 0; y < m_channel.Height; y++)
+                            for (y = 0; y < m_channel.Height; y++)
-                            {
+                            {
-                                if (x < east && x > west)
+                                if (x < east && x > west)
-                                {
+                                {
-                                    if (y < north && y > south)
+                                    if (y < north && y > south)
-                                    {
+                                    {
-                                        fillArea[x, y] = true;
+                                        fillArea[x, y] = true;
-                                    }
+                                    }
-                                }
+                                }
-                            }
+                            }
-                        }
+                        }
-                        m_floodeffects[(StandardTerrainEffects) action].FloodEffect(
+                        m_floodeffects[(StandardTerrainEffects) action].FloodEffect(
-                            m_channel, fillArea, size);
+                            m_channel, fillArea, size);
-                        CheckForTerrainUpdates();
+                        CheckForTerrainUpdates();
-                    }
+                    }
-                    else
+                    else
-                    {
+                    {
-                        m_log.Debug("Unknown terrain flood type " + action);
+                        m_log.Debug("Unknown terrain flood type " + action);
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        #region Console Commands
+        #region Console Commands
-        private void InterfaceLoadFile(Object[] args)
+        private void InterfaceLoadFile(Object[] args)
-        {
+        {
-            LoadFromFile((string) args[0]);
+            LoadFromFile((string) args[0]);
-            CheckForTerrainUpdates();
+            CheckForTerrainUpdates();
-        }
+        }
-        private void InterfaceLoadTileFile(Object[] args)
+        private void InterfaceLoadTileFile(Object[] args)
-        {
+        {
-            LoadFromFile((string) args[0],
+            LoadFromFile((string) args[0],
-                         (int) args[1],
+                         (int) args[1],
-                         (int) args[2],
+                         (int) args[2],
-                         (int) args[3],
+                         (int) args[3],
-                         (int) args[4]);
+                         (int) args[4]);
-            CheckForTerrainUpdates();
+            CheckForTerrainUpdates();
-        }
+        }
-        private void InterfaceSaveFile(Object[] args)
+        private void InterfaceSaveFile(Object[] args)
-        {
+        {
-            SaveToFile((string) args[0]);
+            SaveToFile((string) args[0]);
-        }
+        }
-        private void InterfaceBakeTerrain(Object[] args)
+        private void InterfaceBakeTerrain(Object[] args)
-        {
+        {
-            UpdateRevertMap();
+            UpdateRevertMap();
-        }
+        }
-        private void InterfaceRevertTerrain(Object[] args)
+        private void InterfaceRevertTerrain(Object[] args)
-        {
+        {
-            int x, y;
+            int x, y;
-            for (x = 0; x < m_channel.Width; x++)
+            for (x = 0; x < m_channel.Width; x++)
-                for (y = 0; y < m_channel.Height; y++)
+                for (y = 0; y < m_channel.Height; y++)
-                    m_channel[x, y] = m_revert[x, y];
+                    m_channel[x, y] = m_revert[x, y];
-            CheckForTerrainUpdates();
+            CheckForTerrainUpdates();
-        }
+        }
-        private void InterfaceElevateTerrain(Object[] args)
+        private void InterfaceElevateTerrain(Object[] args)
-        {
+        {
-            int x, y;
+            int x, y;
-            for (x = 0; x < m_channel.Width; x++)
+            for (x = 0; x < m_channel.Width; x++)
-                for (y = 0; y < m_channel.Height; y++)
+                for (y = 0; y < m_channel.Height; y++)
-                    m_channel[x, y] += (double) args[0];
+                    m_channel[x, y] += (double) args[0];
-            CheckForTerrainUpdates();
+            CheckForTerrainUpdates();
-        }
+        }
-        private void InterfaceMultiplyTerrain(Object[] args)
+        private void InterfaceMultiplyTerrain(Object[] args)
-        {
+        {
-            int x, y;
+            int x, y;
-            for (x = 0; x < m_channel.Width; x++)
+            for (x = 0; x < m_channel.Width; x++)
-                for (y = 0; y < m_channel.Height; y++)
+                for (y = 0; y < m_channel.Height; y++)
-                    m_channel[x, y] *= (double) args[0];
+                    m_channel[x, y] *= (double) args[0];
-            CheckForTerrainUpdates();
+            CheckForTerrainUpdates();
-        }
+        }
-        private void InterfaceLowerTerrain(Object[] args)
+        private void InterfaceLowerTerrain(Object[] args)
-        {
+        {
-            int x, y;
+            int x, y;
-            for (x = 0; x < m_channel.Width; x++)
+            for (x = 0; x < m_channel.Width; x++)
-                for (y = 0; y < m_channel.Height; y++)
+                for (y = 0; y < m_channel.Height; y++)
-                    m_channel[x, y] -= (double) args[0];
+                    m_channel[x, y] -= (double) args[0];
-            CheckForTerrainUpdates();
+            CheckForTerrainUpdates();
-        }
+        }
-        private void InterfaceFillTerrain(Object[] args)
+        private void InterfaceFillTerrain(Object[] args)
-        {
+        {
-            int x, y;
+            int x, y;
-            for (x = 0; x < m_channel.Width; x++)
+            for (x = 0; x < m_channel.Width; x++)
-                for (y = 0; y < m_channel.Height; y++)
+                for (y = 0; y < m_channel.Height; y++)
-                    m_channel[x, y] = (double) args[0];
+                    m_channel[x, y] = (double) args[0];
-            CheckForTerrainUpdates();
+            CheckForTerrainUpdates();
-        }
+        }
-        private void InterfaceShowDebugStats(Object[] args)
+        private void InterfaceShowDebugStats(Object[] args)
-        {
+        {
-            double max = Double.MinValue;
+            double max = Double.MinValue;
-            double min = double.MaxValue;
+            double min = double.MaxValue;
-            double avg;
+            double avg;
-            double sum = 0;
+            double sum = 0;
-            int x;
+            int x;
-            for (x = 0; x < m_channel.Width; x++)
+            for (x = 0; x < m_channel.Width; x++)
-            {
+            {
-                int y;
+                int y;
-                for (y = 0; y < m_channel.Height; y++)
+                for (y = 0; y < m_channel.Height; y++)
-                {
+                {
-                    sum += m_channel[x, y];
+                    sum += m_channel[x, y];
-                    if (max < m_channel[x, y])
+                    if (max < m_channel[x, y])
-                        max = m_channel[x, y];
+                        max = m_channel[x, y];
-                    if (min > m_channel[x, y])
+                    if (min > m_channel[x, y])
-                        min = m_channel[x, y];
+                        min = m_channel[x, y];
-                }
+                }
-            }
+            }
-            avg = sum / (m_channel.Height * m_channel.Width);
+            avg = sum / (m_channel.Height * m_channel.Width);
-            m_log.Info("Channel " + m_channel.Width + "x" + m_channel.Height);
+            m_log.Info("Channel " + m_channel.Width + "x" + m_channel.Height);
-            m_log.Info("max/min/avg/sum: " + max + "/" + min + "/" + avg + "/" + sum);
+            m_log.Info("max/min/avg/sum: " + max + "/" + min + "/" + avg + "/" + sum);
-        }
+        }
-        private void InterfaceEnableExperimentalBrushes(Object[] args)
+        private void InterfaceEnableExperimentalBrushes(Object[] args)
-        {
+        {
-            if ((bool) args[0])
+            if ((bool) args[0])
-            {
+            {
-                m_painteffects[StandardTerrainEffects.Revert] = new WeatherSphere();
+                m_painteffects[StandardTerrainEffects.Revert] = new WeatherSphere();
-                m_painteffects[StandardTerrainEffects.Flatten] = new OlsenSphere();
+                m_painteffects[StandardTerrainEffects.Flatten] = new OlsenSphere();
-                m_painteffects[StandardTerrainEffects.Smooth] = new ErodeSphere();
+                m_painteffects[StandardTerrainEffects.Smooth] = new ErodeSphere();
-            }
+            }
-            else
+            else
-            {
+            {
-                InstallDefaultEffects();
+                InstallDefaultEffects();
-            }
+            }
-        }
+        }
-        private void InterfaceRunPluginEffect(Object[] args)
+        private void InterfaceRunPluginEffect(Object[] args)
-        {
+        {
-            if ((string) args[0] == "list")
+            if ((string) args[0] == "list")
-            {
+            {
-                m_log.Info("List of loaded plugins");
+                m_log.Info("List of loaded plugins");
-                foreach (KeyValuePair<string, ITerrainEffect> kvp in m_plugineffects)
+                foreach (KeyValuePair<string, ITerrainEffect> kvp in m_plugineffects)
-                {
+                {
-                    m_log.Info(kvp.Key);
+                    m_log.Info(kvp.Key);
-                }
+                }
-                return;
+                return;
-            }
+            }
-            if ((string) args[0] == "reload")
+            if ((string) args[0] == "reload")
-            {
+            {
-                LoadPlugins();
+                LoadPlugins();
-                return;
+                return;
-            }
+            }
-            if (m_plugineffects.ContainsKey((string) args[0]))
+            if (m_plugineffects.ContainsKey((string) args[0]))
-            {
+            {
-                m_plugineffects[(string) args[0]].RunEffect(m_channel);
+                m_plugineffects[(string) args[0]].RunEffect(m_channel);
-                CheckForTerrainUpdates();
+                CheckForTerrainUpdates();
-            }
+            }
-            else
+            else
-            {
+            {
-                m_log.Warn("No such plugin effect loaded.");
+                m_log.Warn("No such plugin effect loaded.");
-            }
+            }
-        }
+        }
-        private void InstallInterfaces()
+        private void InstallInterfaces()
-        {
+        {
-            // Load / Save
+            // Load / Save
-            string supportedFileExtensions = "";
+            string supportedFileExtensions = "";
-            foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
+            foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
-                supportedFileExtensions += " " + loader.Key + " (" + loader.Value + ")";
+                supportedFileExtensions += " " + loader.Key + " (" + loader.Value + ")";
-            Command loadFromFileCommand =
+            Command loadFromFileCommand =
-                new Command("load", InterfaceLoadFile, "Loads a terrain from a specified file.");
+                new Command("load", InterfaceLoadFile, "Loads a terrain from a specified file.");
-            loadFromFileCommand.AddArgument("filename",
+            loadFromFileCommand.AddArgument("filename",
-                                            "The file you wish to load from, the file extension determines the loader to be used. Supported extensions include: " +
+                                            "The file you wish to load from, the file extension determines the loader to be used. Supported extensions include: " +
-                                            supportedFileExtensions, "String");
+                                            supportedFileExtensions, "String");
-            Command saveToFileCommand =
+            Command saveToFileCommand =
-                new Command("save", InterfaceSaveFile, "Saves the current heightmap to a specified file.");
+                new Command("save", InterfaceSaveFile, "Saves the current heightmap to a specified file.");
-            saveToFileCommand.AddArgument("filename",
+            saveToFileCommand.AddArgument("filename",
-                                          "The destination filename for your heightmap, the file extension determines the format to save in. Supported extensions include: " +
+                                          "The destination filename for your heightmap, the file extension determines the format to save in. Supported extensions include: " +
-                                          supportedFileExtensions, "String");
+                                          supportedFileExtensions, "String");
-            Command loadFromTileCommand =
+            Command loadFromTileCommand =
-                new Command("load-tile", InterfaceLoadTileFile, "Loads a terrain from a section of a larger file.");
+                new Command("load-tile", InterfaceLoadTileFile, "Loads a terrain from a section of a larger file.");
-            loadFromTileCommand.AddArgument("filename",
+            loadFromTileCommand.AddArgument("filename",
-                                            "The file you wish to load from, the file extension determines the loader to be used. Supported extensions include: " +
+                                            "The file you wish to load from, the file extension determines the loader to be used. Supported extensions include: " +
-                                            supportedFileExtensions, "String");
+                                            supportedFileExtensions, "String");
-            loadFromTileCommand.AddArgument("file width", "The width of the file in tiles", "Integer");
+            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("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",
+            loadFromTileCommand.AddArgument("minimum X tile", "The X region coordinate of the first section on the file",
-                                            "Integer");
+                                            "Integer");
-            loadFromTileCommand.AddArgument("minimum Y tile", "The Y region coordinate of the first section on the file",
+            loadFromTileCommand.AddArgument("minimum Y tile", "The Y region coordinate of the first section on the file",
-                                            "Integer");
+                                            "Integer");
-            // Terrain adjustments
+            // Terrain adjustments
-            Command fillRegionCommand =
+            Command fillRegionCommand =
-                new Command("fill", InterfaceFillTerrain, "Fills the current heightmap with a specified value.");
+                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.",
+            fillRegionCommand.AddArgument("value", "The numeric value of the height you wish to set your region to.",
-                                          "Double");
+                                          "Double");
-            Command elevateCommand =
+            Command elevateCommand =
-                new Command("elevate", InterfaceElevateTerrain, "Raises the current heightmap by the specified amount.");
+                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");
+            elevateCommand.AddArgument("amount", "The amount of height to add to the terrain in meters.", "Double");
-            Command lowerCommand =
+            Command lowerCommand =
-                new Command("lower", InterfaceLowerTerrain, "Lowers the current heightmap by the specified amount.");
+                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");
+            lowerCommand.AddArgument("amount", "The amount of height to remove from the terrain in meters.", "Double");
-            Command multiplyCommand =
+            Command multiplyCommand =
-                new Command("multiply", InterfaceMultiplyTerrain, "Multiplies the heightmap by the value specified.");
+                new Command("multiply", InterfaceMultiplyTerrain, "Multiplies the heightmap by the value specified.");
-            multiplyCommand.AddArgument("value", "The value to multiply the heightmap by.", "Double");
+            multiplyCommand.AddArgument("value", "The value to multiply the heightmap by.", "Double");
-            Command bakeRegionCommand =
+            Command bakeRegionCommand =
-                new Command("bake", InterfaceBakeTerrain, "Saves the current terrain into the regions revert map.");
+                new Command("bake", InterfaceBakeTerrain, "Saves the current terrain into the regions revert map.");
-            Command revertRegionCommand =
+            Command revertRegionCommand =
-                new Command("revert", InterfaceRevertTerrain, "Loads the revert map terrain into the regions heightmap.");
+                new Command("revert", InterfaceRevertTerrain, "Loads the revert map terrain into the regions heightmap.");
-            // Debug
+            // Debug
-            Command showDebugStatsCommand =
+            Command showDebugStatsCommand =
-                new Command("stats", InterfaceShowDebugStats,
+                new Command("stats", InterfaceShowDebugStats,
-                            "Shows some information about the regions heightmap for debugging purposes.");
+                            "Shows some information about the regions heightmap for debugging purposes.");
-            Command experimentalBrushesCommand =
+            Command experimentalBrushesCommand =
-                new Command("newbrushes", InterfaceEnableExperimentalBrushes,
+                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.");
+                            "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");
+            experimentalBrushesCommand.AddArgument("Enabled?", "true / false - Enable new brushes", "Boolean");
-            //Plugins
+            //Plugins
-            Command pluginRunCommand =
+            Command pluginRunCommand =
-                new Command("effect", InterfaceRunPluginEffect, "Runs a specified plugin effect");
+                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");
+            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", loadFromFileCommand);
-            m_commander.RegisterCommand("load-tile", loadFromTileCommand);
+            m_commander.RegisterCommand("load-tile", loadFromTileCommand);
-            m_commander.RegisterCommand("save", saveToFileCommand);
+            m_commander.RegisterCommand("save", saveToFileCommand);
-            m_commander.RegisterCommand("fill", fillRegionCommand);
+            m_commander.RegisterCommand("fill", fillRegionCommand);
-            m_commander.RegisterCommand("elevate", elevateCommand);
+            m_commander.RegisterCommand("elevate", elevateCommand);
-            m_commander.RegisterCommand("lower", lowerCommand);
+            m_commander.RegisterCommand("lower", lowerCommand);
-            m_commander.RegisterCommand("multiply", multiplyCommand);
+            m_commander.RegisterCommand("multiply", multiplyCommand);
-            m_commander.RegisterCommand("bake", bakeRegionCommand);
+            m_commander.RegisterCommand("bake", bakeRegionCommand);
-            m_commander.RegisterCommand("revert", revertRegionCommand);
+            m_commander.RegisterCommand("revert", revertRegionCommand);
-            m_commander.RegisterCommand("newbrushes", experimentalBrushesCommand);
+            m_commander.RegisterCommand("newbrushes", experimentalBrushesCommand);
-            m_commander.RegisterCommand("stats", showDebugStatsCommand);
+            m_commander.RegisterCommand("stats", showDebugStatsCommand);
-            m_commander.RegisterCommand("effect", pluginRunCommand);
+            m_commander.RegisterCommand("effect", pluginRunCommand);
-            // Add this to our scene so scripts can call these functions
+            // Add this to our scene so scripts can call these functions
-            m_scene.RegisterModuleCommander("Terrain", m_commander);
+            m_scene.RegisterModuleCommander("Terrain", m_commander);
-        }
+        }
-        #endregion
+        #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/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain
+namespace OpenSim.Region.Environment.Modules.World.Terrain
-{
+{
-    public static class TerrainUtil
+    public static class TerrainUtil
-    {
+    {
-        public static double MetersToSphericalStrength(double size)
+        public static double MetersToSphericalStrength(double size)
-        {
+        {
-            return Math.Pow(2, size);
+            return Math.Pow(2, size);
-        }
+        }
-        public static double SphericalFactor(double x, double y, double rx, double ry, double 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));
+            return size * size - ((x - rx) * (x - rx) + (y - ry) * (y - ry));
-        }
+        }
-        public static double GetBilinearInterpolate(double x, double y, ITerrainChannel map)
+        public static double GetBilinearInterpolate(double x, double y, ITerrainChannel map)
-        {
+        {
-            int w = map.Width;
+            int w = map.Width;
-            int h = map.Height;
+            int h = map.Height;
-            if (x > w - 2.0)
+            if (x > w - 2.0)
-                x = w - 2.0;
+                x = w - 2.0;
-            if (y > h - 2.0)
+            if (y > h - 2.0)
-                y = h - 2.0;
+                y = h - 2.0;
-            if (x < 0.0)
+            if (x < 0.0)
-                x = 0.0;
+                x = 0.0;
-            if (y < 0.0)
+            if (y < 0.0)
-                y = 0.0;
+                y = 0.0;
-            int stepSize = 1;
+            int stepSize = 1;
-            double h00 = map[(int) x, (int) y];
+            double h00 = map[(int) x, (int) y];
-            double h10 = map[(int) x + stepSize, (int) y];
+            double h10 = map[(int) x + stepSize, (int) y];
-            double h01 = map[(int) x, (int) y + stepSize];
+            double h01 = map[(int) x, (int) y + stepSize];
-            double h11 = map[(int) x + stepSize, (int) y + stepSize];
+            double h11 = map[(int) x + stepSize, (int) y + stepSize];
-            double h1 = h00;
+            double h1 = h00;
-            double h2 = h10;
+            double h2 = h10;
-            double h3 = h01;
+            double h3 = h01;
-            double h4 = h11;
+            double h4 = h11;
-            double a00 = h1;
+            double a00 = h1;
-            double a10 = h2 - h1;
+            double a10 = h2 - h1;
-            double a01 = h3 - h1;
+            double a01 = h3 - h1;
-            double a11 = h1 - h2 - h3 + h4;
+            double a11 = h1 - h2 - h3 + h4;
-            double partialx = x - (int) x;
+            double partialx = x - (int) x;
-            double partialz = y - (int) y;
+            double partialz = y - (int) y;
-            double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz);
+            double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz);
-            return hi;
+            return hi;
-        }
+        }
-        private static double Noise(double x, double y)
+        private static double Noise(double x, double y)
-        {
+        {
-            int n = (int) x + (int) (y * 749);
+            int n = (int) x + (int) (y * 749);
-            n = (n << 13) ^ n;
+            n = (n << 13) ^ n;
-            return (1.0 - ((n * (n * n * 15731 + 789221) + 1376312589) & 0x7fffffff) / 1073741824.0);
+            return (1.0 - ((n * (n * n * 15731 + 789221) + 1376312589) & 0x7fffffff) / 1073741824.0);
-        }
+        }
-        private static double SmoothedNoise1(double x, double y)
+        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 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 sides = (Noise(x - 1, y) + Noise(x + 1, y) + Noise(x, y - 1) + Noise(x, y + 1)) / 8;
-            double center = Noise(x, y) / 4;
+            double center = Noise(x, y) / 4;
-            return corners + sides + center;
+            return corners + sides + center;
-        }
+        }
-        private static double Interpolate(double x, double y, double z)
+        private static double Interpolate(double x, double y, double z)
-        {
+        {
-            return (x * (1.0 - z)) + (y * z);
+            return (x * (1.0 - z)) + (y * z);
-        }
+        }
-        private static double InterpolatedNoise(double x, double y)
+        private static double InterpolatedNoise(double x, double y)
-        {
+        {
-            int integer_X = (int) (x);
+            int integer_X = (int) (x);
-            double fractional_X = x - integer_X;
+            double fractional_X = x - integer_X;
-            int integer_Y = (int) y;
+            int integer_Y = (int) y;
-            double fractional_Y = y - integer_Y;
+            double fractional_Y = y - integer_Y;
-            double v1 = SmoothedNoise1(integer_X, integer_Y);
+            double v1 = SmoothedNoise1(integer_X, integer_Y);
-            double v2 = SmoothedNoise1(integer_X + 1, integer_Y);
+            double v2 = SmoothedNoise1(integer_X + 1, integer_Y);
-            double v3 = SmoothedNoise1(integer_X, integer_Y + 1);
+            double v3 = SmoothedNoise1(integer_X, integer_Y + 1);
-            double v4 = SmoothedNoise1(integer_X + 1, integer_Y + 1);
+            double v4 = SmoothedNoise1(integer_X + 1, integer_Y + 1);
-            double i1 = Interpolate(v1, v2, fractional_X);
+            double i1 = Interpolate(v1, v2, fractional_X);
-            double i2 = Interpolate(v3, v4, fractional_X);
+            double i2 = Interpolate(v3, v4, fractional_X);
-            return Interpolate(i1, i2, fractional_Y);
+            return Interpolate(i1, i2, fractional_Y);
-        }
+        }
-        public static double PerlinNoise2D(double x, double y, int octaves, double persistence)
+        public static double PerlinNoise2D(double x, double y, int octaves, double persistence)
-        {
+        {
-            double frequency = 0.0;
+            double frequency = 0.0;
-            double amplitude = 0.0;
+            double amplitude = 0.0;
-            double total = 0.0;
+            double total = 0.0;
-            for (int i = 0; i < octaves; i++)
+            for (int i = 0; i < octaves; i++)
-            {
+            {
-                frequency = Math.Pow(2, i);
+                frequency = Math.Pow(2, i);
-                amplitude = Math.Pow(persistence, i);
+                amplitude = Math.Pow(persistence, i);
-                total += InterpolatedNoise(x * frequency, y * frequency) * amplitude;
+                total += InterpolatedNoise(x * frequency, y * frequency) * amplitude;
-            }
+            }
-            return total;
+            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 System;
-using NUnit.Framework;
+using NUnit.Framework;
-using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
+using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.Tests
+namespace OpenSim.Region.Environment.Modules.World.Terrain.Tests
-{
+{
-    [TestFixture]
+    [TestFixture]
-    public class TerrainTest
+    public class TerrainTest
-    {
+    {
-        [Test]
+        [Test]
-        public void BrushTest()
+        public void BrushTest()
-        {
+        {
-            TerrainChannel x = new TerrainChannel(256, 256);
+            TerrainChannel x = new TerrainChannel(256, 256);
-            ITerrainPaintableEffect effect = new RaiseSphere();
+            ITerrainPaintableEffect effect = new RaiseSphere();
-            effect.PaintEffect(x, 128.0, 128.0, 50, 0.1);
+            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[128, 128] > 0.0, "Raise brush not raising values.");
-            Assert.That(x[0, 128] > 0.0, "Raise brush lowering edge values.");
+            Assert.That(x[0, 128] > 0.0, "Raise brush lowering edge values.");
-            x = new TerrainChannel(256, 256);
+            x = new TerrainChannel(256, 256);
-            effect = new LowerSphere();
+            effect = new LowerSphere();
-            effect.PaintEffect(x, 128.0, 128.0, 50, 0.1);
+            effect.PaintEffect(x, 128.0, 128.0, 50, 0.1);
-            Assert.That(x[128, 128] < 0.0, "Lower not lowering values.");
+            Assert.That(x[128, 128] < 0.0, "Lower not lowering values.");
-            Assert.That(x[0, 128] < 0.0, "Lower brush affecting edge values.");
+            Assert.That(x[0, 128] < 0.0, "Lower brush affecting edge values.");
-        }
+        }
-        [Test]
+        [Test]
-        public void TerrainChannelTest()
+        public void TerrainChannelTest()
-        {
+        {
-            TerrainChannel x = new TerrainChannel(256, 256);
+            TerrainChannel x = new TerrainChannel(256, 256);
-            Assert.That(x[0, 0] == 0.0, "Terrain not initialising correctly.");
+            Assert.That(x[0, 0] == 0.0, "Terrain not initialising correctly.");
-            x[0, 0] = 1.0;
+            x[0, 0] = 1.0;
-            Assert.That(x[0, 0] == 1.0, "Terrain not setting values correctly.");
+            Assert.That(x[0, 0] == 1.0, "Terrain not setting values correctly.");
-            x[0, 0] = 0;
+            x[0, 0] = 0;
-            x[0, 0] += 5.0;
+            x[0, 0] += 5.0;
-            x[0, 0] -= 1.0;
+            x[0, 0] -= 1.0;
-            Assert.That(x[0, 0] == 4.0, "Terrain addition/subtraction error.");
+            Assert.That(x[0, 0] == 4.0, "Terrain addition/subtraction error.");
-            x[0, 0] = Math.PI;
+            x[0, 0] = Math.PI;
-            double[,] doublesExport = x.GetDoubles();
+            double[,] doublesExport = x.GetDoubles();
-            Assert.That(doublesExport[0, 0] == Math.PI, "Export to double[,] array not working correctly.");
+            Assert.That(doublesExport[0, 0] == Math.PI, "Export to double[,] array not working correctly.");
-            x[0, 0] = 1.0;
+            x[0, 0] = 1.0;
-            float[] floatsExport = x.GetFloatsSerialised();
+            float[] floatsExport = x.GetFloatsSerialised();
-            Assert.That(floatsExport[0] == 1.0f, "Export to float[] not working correctly.");
+            Assert.That(floatsExport[0] == 1.0f, "Export to float[] not working correctly.");
-            x[0, 0] = 1.0;
+            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.");
-            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();
+            TerrainChannel y = x.Copy();
-            Assert.That(!ReferenceEquals(x, y), "Terrain copy not duplicating correctly.");
+            Assert.That(!ReferenceEquals(x, y), "Terrain copy not duplicating correctly.");
-            Assert.That(!ReferenceEquals(x.GetDoubles(), y.GetDoubles()), "Terrain array not duplicating correctly.");
+            Assert.That(!ReferenceEquals(x.GetDoubles(), y.GetDoubles()), "Terrain array not duplicating correctly.");
-        }
+        }
-    }
+    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
index f144444..32e45b7 100644
--- a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
@@ -1,251 +1,251 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
-using System.Timers;
+using System.Timers;
-using Axiom.Math;
+using Axiom.Math;
-using libsecondlife;
+using libsecondlife;
-using log4net;
+using log4net;
-using Nini.Config;
+using Nini.Config;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules
+namespace OpenSim.Region.Environment.Modules
-{
+{
-    /// <summary>
+    /// <summary>
-    /// Version 2.0 - Very hacky compared to the original. Will fix original and release as 0.3 later.
+    /// Version 2.0 - Very hacky compared to the original. Will fix original and release as 0.3 later.
-    /// </summary>
+    /// </summary>
-    public class TreePopulatorModule : IRegionModule
+    public class TreePopulatorModule : IRegionModule
-    {
+    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private Scene m_scene;
+        private Scene m_scene;
-        public double m_tree_density = 50.0; // Aim for this many per region
+        public double m_tree_density = 50.0; // Aim for this many per region
-        public double m_tree_updates = 1000.0; // MS between updates
+        public double m_tree_updates = 1000.0; // MS between updates
-        private List<LLUUID> m_trees;
+        private List<LLUUID> m_trees;
-        #region IRegionModule Members
+        #region IRegionModule Members
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(Scene scene, IConfigSource config)
-        {
+        {
-            try
+            try
-            {
+            {
-                m_tree_density = config.Configs["Trees"].GetDouble("tree_density", m_tree_density);
+                m_tree_density = config.Configs["Trees"].GetDouble("tree_density", m_tree_density);
-            }
+            }
-            catch (Exception)
+            catch (Exception)
-            {
+            {
-            }
+            }
-            m_trees = new List<LLUUID>();
+            m_trees = new List<LLUUID>();
-            m_scene = scene;
+            m_scene = scene;
-            m_scene.EventManager.OnPluginConsole += new EventManager.OnPluginConsoleDelegate(EventManager_OnPluginConsole);
+            m_scene.EventManager.OnPluginConsole += new EventManager.OnPluginConsoleDelegate(EventManager_OnPluginConsole);
-            Timer CalculateTrees = new Timer(m_tree_updates);
+            Timer CalculateTrees = new Timer(m_tree_updates);
-            CalculateTrees.Elapsed += new ElapsedEventHandler(CalculateTrees_Elapsed);
+            CalculateTrees.Elapsed += new ElapsedEventHandler(CalculateTrees_Elapsed);
-            CalculateTrees.Start();
+            CalculateTrees.Start();
-            m_log.Debug("[TREES]: Initialised tree module");
+            m_log.Debug("[TREES]: Initialised tree module");
-        }
+        }
-        public void PostInitialise()
+        public void PostInitialise()
-        {
+        {
-        }
+        }
-        public void Close()
+        public void Close()
-        {
+        {
-        }
+        }
-        public string Name
+        public string Name
-        {
+        {
-            get { return "TreePopulatorModule"; }
+            get { return "TreePopulatorModule"; }
-        }
+        }
-        public bool IsSharedModule
+        public bool IsSharedModule
-        {
+        {
-            get { return false; }
+            get { return false; }
-        }
+        }
-        #endregion
+        #endregion
-        private void EventManager_OnPluginConsole(string[] args)
+        private void EventManager_OnPluginConsole(string[] args)
-        {
+        {
-            if (args[0] == "tree")
+            if (args[0] == "tree")
-            {
+            {
-                m_log.Debug("[TREES]: New tree planting");
+                m_log.Debug("[TREES]: New tree planting");
-                CreateTree(new LLVector3(128.0f, 128.0f, 0.0f));
+                CreateTree(new LLVector3(128.0f, 128.0f, 0.0f));
-            }
+            }
-        }
+        }
-        private void growTrees()
+        private void growTrees()
-        {
+        {
-            foreach (LLUUID tree in m_trees)
+            foreach (LLUUID tree in m_trees)
-            {
+            {
-                if (m_scene.Entities.ContainsKey(tree))
+                if (m_scene.Entities.ContainsKey(tree))
-                {
+                {
-                    SceneObjectPart s_tree = ((SceneObjectGroup) m_scene.Entities[tree]).RootPart;
+                    SceneObjectPart s_tree = ((SceneObjectGroup) m_scene.Entities[tree]).RootPart;
-                    // 100 seconds to grow 1m
+                    // 100 seconds to grow 1m
-                    s_tree.Scale += new LLVector3(0.1f, 0.1f, 0.1f);
+                    s_tree.Scale += new LLVector3(0.1f, 0.1f, 0.1f);
-                    s_tree.SendFullUpdateToAllClients();
+                    s_tree.SendFullUpdateToAllClients();
-                    //s_tree.ScheduleTerseUpdate();
+                    //s_tree.ScheduleTerseUpdate();
-                }
+                }
-                else
+                else
-                {
+                {
-                    m_trees.Remove(tree);
+                    m_trees.Remove(tree);
-                }
+                }
-            }
+            }
-        }
+        }
-        private void seedTrees()
+        private void seedTrees()
-        {
+        {
-            foreach (LLUUID tree in m_trees)
+            foreach (LLUUID tree in m_trees)
-            {
+            {
-                if (m_scene.Entities.ContainsKey(tree))
+                if (m_scene.Entities.ContainsKey(tree))
-                {
+                {
-                    SceneObjectPart s_tree = ((SceneObjectGroup) m_scene.Entities[tree]).RootPart;
+                    SceneObjectPart s_tree = ((SceneObjectGroup) m_scene.Entities[tree]).RootPart;
-                    if (s_tree.Scale.X > 0.5)
+                    if (s_tree.Scale.X > 0.5)
-                    {
+                    {
-                        if (Util.RandomClass.NextDouble() > 0.75)
+                        if (Util.RandomClass.NextDouble() > 0.75)
-                        {
+                        {
-                            SpawnChild(s_tree);
+                            SpawnChild(s_tree);
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-                else
+                else
-                {
+                {
-                    m_trees.Remove(tree);
+                    m_trees.Remove(tree);
-                }
+                }
-            }
+            }
-        }
+        }
-        private void killTrees()
+        private void killTrees()
-        {
+        {
-            foreach (LLUUID tree in m_trees)
+            foreach (LLUUID tree in m_trees)
-            {
+            {
-                double killLikelyhood = 0.0;
+                double killLikelyhood = 0.0;
-                if (m_scene.Entities.ContainsKey(tree))
+                if (m_scene.Entities.ContainsKey(tree))
-                {
+                {
-                    SceneObjectPart selectedTree = ((SceneObjectGroup) m_scene.Entities[tree]).RootPart;
+                    SceneObjectPart selectedTree = ((SceneObjectGroup) m_scene.Entities[tree]).RootPart;
-                    double selectedTreeScale = Math.Sqrt(Math.Pow(selectedTree.Scale.X, 2) +
+                    double selectedTreeScale = Math.Sqrt(Math.Pow(selectedTree.Scale.X, 2) +
-                                                         Math.Pow(selectedTree.Scale.Y, 2) +
+                                                         Math.Pow(selectedTree.Scale.Y, 2) +
-                                                         Math.Pow(selectedTree.Scale.Z, 2));
+                                                         Math.Pow(selectedTree.Scale.Z, 2));
-                    foreach (LLUUID picktree in m_trees)
+                    foreach (LLUUID picktree in m_trees)
-                    {
+                    {
-                        if (picktree != tree)
+                        if (picktree != tree)
-                        {
+                        {
-                            SceneObjectPart pickedTree = ((SceneObjectGroup) m_scene.Entities[picktree]).RootPart;
+                            SceneObjectPart pickedTree = ((SceneObjectGroup) m_scene.Entities[picktree]).RootPart;
-                            double pickedTreeScale = Math.Sqrt(Math.Pow(pickedTree.Scale.X, 2) +
+                            double pickedTreeScale = Math.Sqrt(Math.Pow(pickedTree.Scale.X, 2) +
-                                                               Math.Pow(pickedTree.Scale.Y, 2) +
+                                                               Math.Pow(pickedTree.Scale.Y, 2) +
-                                                               Math.Pow(pickedTree.Scale.Z, 2));
+                                                               Math.Pow(pickedTree.Scale.Z, 2));
-                            double pickedTreeDistance = Math.Sqrt(Math.Pow(Math.Abs(pickedTree.AbsolutePosition.X - selectedTree.AbsolutePosition.X), 2) +
+                            double pickedTreeDistance = Math.Sqrt(Math.Pow(Math.Abs(pickedTree.AbsolutePosition.X - selectedTree.AbsolutePosition.X), 2) +
-                                                                  Math.Pow(Math.Abs(pickedTree.AbsolutePosition.Y - selectedTree.AbsolutePosition.Y), 2) +
+                                                                  Math.Pow(Math.Abs(pickedTree.AbsolutePosition.Y - selectedTree.AbsolutePosition.Y), 2) +
-                                                                  Math.Pow(Math.Abs(pickedTree.AbsolutePosition.Z - selectedTree.AbsolutePosition.Z), 2));
+                                                                  Math.Pow(Math.Abs(pickedTree.AbsolutePosition.Z - selectedTree.AbsolutePosition.Z), 2));
-                            killLikelyhood += (selectedTreeScale / (pickedTreeScale * pickedTreeDistance)) * 0.1;
+                            killLikelyhood += (selectedTreeScale / (pickedTreeScale * pickedTreeDistance)) * 0.1;
-                        }
+                        }
-                    }
+                    }
-                    if (Util.RandomClass.NextDouble() < killLikelyhood)
+                    if (Util.RandomClass.NextDouble() < killLikelyhood)
-                    {
+                    {
-                        m_scene.RemoveEntity(selectedTree.ParentGroup);
+                        m_scene.RemoveEntity(selectedTree.ParentGroup);
-                        m_trees.Remove(selectedTree.ParentGroup.UUID);
+                        m_trees.Remove(selectedTree.ParentGroup.UUID);
-                        m_scene.ForEachClient(delegate(IClientAPI controller)
+                        m_scene.ForEachClient(delegate(IClientAPI controller)
-                                                  {
+                                                  {
-                                                      controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
+                                                      controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
-                                                                                selectedTree.LocalId);
+                                                                                selectedTree.LocalId);
-                                                  });
+                                                  });
-                        break;
+                        break;
-                    }
+                    }
-                    else
+                    else
-                    {
+                    {
-                        selectedTree.SetText(killLikelyhood.ToString(), new Vector3(1.0f, 1.0f, 1.0f), 1.0);
+                        selectedTree.SetText(killLikelyhood.ToString(), new Vector3(1.0f, 1.0f, 1.0f), 1.0);
-                    }
+                    }
-                }
+                }
-                else
+                else
-                {
+                {
-                    m_trees.Remove(tree);
+                    m_trees.Remove(tree);
-                }
+                }
-            }
+            }
-        }
+        }
-        private void SpawnChild(SceneObjectPart s_tree)
+        private void SpawnChild(SceneObjectPart s_tree)
-        {
+        {
-            LLVector3 position = new LLVector3();
+            LLVector3 position = new LLVector3();
-            position.X = s_tree.AbsolutePosition.X + (1 * (-1 * Util.RandomClass.Next(1)));
+            position.X = s_tree.AbsolutePosition.X + (1 * (-1 * Util.RandomClass.Next(1)));
-            if (position.X > 255)
+            if (position.X > 255)
-                position.X = 255;
+                position.X = 255;
-            if (position.X < 0)
+            if (position.X < 0)
-                position.X = 0;
+                position.X = 0;
-            position.Y = s_tree.AbsolutePosition.Y + (1 * (-1 * Util.RandomClass.Next(1)));
+            position.Y = s_tree.AbsolutePosition.Y + (1 * (-1 * Util.RandomClass.Next(1)));
-            if (position.Y > 255)
+            if (position.Y > 255)
-                position.Y = 255;
+                position.Y = 255;
-            if (position.Y < 0)
+            if (position.Y < 0)
-                position.Y = 0;
+                position.Y = 0;
-            double randX = ((Util.RandomClass.NextDouble() * 2.0) - 1.0) * (s_tree.Scale.X * 3);
+            double randX = ((Util.RandomClass.NextDouble() * 2.0) - 1.0) * (s_tree.Scale.X * 3);
-            double randY = ((Util.RandomClass.NextDouble() * 2.0) - 1.0) * (s_tree.Scale.X * 3);
+            double randY = ((Util.RandomClass.NextDouble() * 2.0) - 1.0) * (s_tree.Scale.X * 3);
-            position.X += (float) randX;
+            position.X += (float) randX;
-            position.Y += (float) randY;
+            position.Y += (float) randY;
-            CreateTree(position);
+            CreateTree(position);
-        }
+        }
-        private void CreateTree(LLVector3 position)
+        private void CreateTree(LLVector3 position)
-        {
+        {
-            position.Z = (float) m_scene.Heightmap[(int) position.X, (int) position.Y];
+            position.Z = (float) m_scene.Heightmap[(int) position.X, (int) position.Y];
-            SceneObjectGroup tree =
+            SceneObjectGroup tree =
-                m_scene.AddTree(new LLVector3(0.1f, 0.1f, 0.1f),
+                m_scene.AddTree(new LLVector3(0.1f, 0.1f, 0.1f),
-                                LLQuaternion.Identity,
+                                LLQuaternion.Identity,
-                                position,
+                                position,
-                                Tree.Cypress1,
+                                Tree.Cypress1,
-                                false);
+                                false);
-            m_trees.Add(tree.UUID);
+            m_trees.Add(tree.UUID);
-            tree.SendGroupFullUpdate();
+            tree.SendGroupFullUpdate();
-        }
+        }
-        private void CalculateTrees_Elapsed(object sender, ElapsedEventArgs e)
+        private void CalculateTrees_Elapsed(object sender, ElapsedEventArgs e)
-        {
+        {
-            growTrees();
+            growTrees();
-            seedTrees();
+            seedTrees();
-            killTrees();
+            killTrees();
-        }
+        }
-    }
+    }
 }
 \ No newline at end of file