*Moved LandManagement into its own region module (spiffy!)

18 files changed, 2022 insertions, 1878 deletions

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index e50187e..f96d474 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -502,7 +502,10 @@ namespace OpenSim
             scene.PermissionsMngr.BypassPermissions = !m_permissions;
             
             // We need to do this after we've initialized the scripting engines.
-            scene.StartScripts();            
+            scene.StartScripts();
+
+            scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
+            scene.LandChannel.performParcelPrimCountUpdate();
 
             m_sceneManager.Add(scene);                        
 
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index a23bd6c..b6f0f12 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -155,8 +155,6 @@ namespace OpenSim.Region.ClientStack
             }
 
             scene.LoadPrimsFromStorage(m_permissions, regionInfo.originRegionID);
-            scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
-            scene.performParcelPrimCountUpdate();
             scene.StartTimer();
             return scene;
         }
diff --git a/OpenSim/Region/Environment/Interfaces/ILandChannel.cs b/OpenSim/Region/Environment/Interfaces/ILandChannel.cs
new file mode 100644
index 0000000..1e0493f
--- /dev/null
+++ b/OpenSim/Region/Environment/Interfaces/ILandChannel.cs
@@ -0,0 +1,52 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+using libsecondlife;

+using libsecondlife.Packets;

+using OpenSim.Region.Environment.Scenes;

+using OpenSim.Framework;

+

+namespace OpenSim.Region.Environment.Interfaces

+{

+    public interface ILandChannel

+    {

+        bool allowedForcefulBans { get; set; }

+        void IncomingLandObjectsFromStorage(List<LandData> data);

+        void IncomingLandObjectFromStorage(LandData data);

+

+        void NoLandDataFromStorage();

+        ILandObject getLandObject(int x, int y);

+        ILandObject getLandObject(float x, float y);

+        void setPrimsTainted();

+        bool isLandPrimCountTainted();

+        void sendLandUpdate(ScenePresence avatar, bool force);

+        void sendLandUpdate(ScenePresence avatar);

+        void resetAllLandPrimCounts();

+        void addPrimToLandPrimCounts(SceneObjectGroup obj);

+        void removePrimFromLandPrimCounts(SceneObjectGroup obj);

+        void finalizeLandPrimCountUpdate();

+        void updateLandPrimCounts();

+        void performParcelPrimCountUpdate();

+        void updateLandObject(int local_id, LandData newData);

+

+        void sendParcelOverlay(IClientAPI remote_client);

+        void handleParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client);

+        void handleParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client);

+        void handleParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client);

+        void handleParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client);

+        void handleParcelSelectObjectsRequest(int local_id, int request_type, IClientAPI remote_client);

+        void handleParcelObjectOwnersRequest(int local_id, IClientAPI remote_client);

+

+        void resetSimLandObjects();

+        List<ILandObject> parcelsNearPoint(LLVector3 position);

+        void sendYouAreBannedNotice(ScenePresence avatar);

+        void handleAvatarChangingParcel(ScenePresence avatar, int localLandID, LLUUID regionID);

+        void sendOutNearestBanLine(IClientAPI avatar);

+        void handleSignificantClientMovement(IClientAPI remote_client);

+        void handleAnyClientMovement(ScenePresence avatar);

+        void handleParcelAccessRequest(LLUUID agentID, LLUUID sessionID, uint flags, int sequenceID, int landLocalID, IClientAPI remote_client);

+        void handleParcelAccessUpdateRequest(LLUUID agentID, LLUUID sessionID, uint flags, int landLocalID, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client);

+

+    }

+}

diff --git a/OpenSim/Region/Environment/Interfaces/ILandObject.cs b/OpenSim/Region/Environment/Interfaces/ILandObject.cs
new file mode 100644
index 0000000..f68fb82
--- /dev/null
+++ b/OpenSim/Region/Environment/Interfaces/ILandObject.cs
@@ -0,0 +1,54 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+using libsecondlife;

+using libsecondlife.Packets;

+using OpenSim.Region.Environment.Scenes;

+

+using OpenSim.Framework;

+

+namespace OpenSim.Region.Environment.Interfaces

+{

+    public interface ILandObject

+    {

+

+        LandData landData { get; set; }

+        bool[,] landBitmap { get; set; }

+        LLUUID regionUUID { get; }

+        bool containsPoint(int x, int y);

+        ILandObject Copy();

+        

+

+        void sendLandUpdateToAvatarsOverMe();

+

+        void sendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client);

+        void updateLandProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client);

+        bool isEitherBannedOrRestricted(LLUUID avatar);

+        bool isBannedFromLand(LLUUID avatar);

+        bool isRestrictedFromLand(LLUUID avatar);

+        void sendLandUpdateToClient(IClientAPI remote_client);

+        ParcelAccessListReplyPacket.ListBlock[] createAccessListArrayByFlag(ParcelManager.AccessList flag);

+        void sendAccessList(LLUUID agentID, LLUUID sessionID, uint flags, int sequenceID, IClientAPI remote_client);

+        void updateAccessList(uint flags, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client);

+        void updateLandBitmapByteArray();

+        void setLandBitmapFromByteArray();

+        bool[,] getLandBitmap();

+        void forceUpdateLandInfo();

+        void setLandBitmap(bool[,] bitmap);

+

+        bool[,] basicFullRegionLandBitmap();

+        bool[,] getSquareLandBitmap(int start_x, int start_y, int end_x, int end_y);

+        bool[,] modifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value);

+        bool[,] mergeLandBitmaps(bool[,] bitmap_base, bool[,] bitmap_add);

+        void sendForceObjectSelect(int local_id, int request_type, IClientAPI remote_client);

+        void sendLandObjectOwners(IClientAPI remote_client);

+        void returnObject(SceneObjectGroup obj);

+        void returnLandObjects(int type, LLUUID owner);

+        void resetLandPrimCounts();

+        void addPrimToCount(SceneObjectGroup obj);

+        void removePrimFromCount(SceneObjectGroup obj);

+

+

+    }

+}

diff --git a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
index 473897f..c757461 100644
--- a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
+++ b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
@@ -28,7 +28,6 @@
 using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.LandManagement;
 using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.Environment.Interfaces
@@ -69,7 +68,7 @@ namespace OpenSim.Region.Environment.Interfaces
         void StoreTerrain(double[,] terrain, LLUUID regionID);
         double[,] LoadTerrain(LLUUID regionID);
 
-        void StoreLandObject(Land Parcel, LLUUID regionUUID);
+        void StoreLandObject(ILandObject Parcel);
         void RemoveLandObject(LLUUID globalID);
         List<LandData> LoadLandObjects(LLUUID regionUUID);
 
diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs
index 0b3c5de..ba0c550 100644
--- a/OpenSim/Region/Environment/LandManagement/LandManager.cs
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs
@@ -1,942 +1,916 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using Axiom.Math;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework;
-using OpenSim.Framework.Console;
-using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Physics.Manager;
-
-namespace OpenSim.Region.Environment.LandManagement
-{
-    #region LandManager Class
-
-    /// <summary>
-    /// Handles Land objects and operations requiring information from other Land objects (divide, join, etc)
-    /// </summary>
-    public class LandManager
-    {
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-
-        #region Constants
-
-        //Land types set with flags in ParcelOverlay.
-        //Only one of these can be used. 
-        public const byte LAND_TYPE_PUBLIC = (byte) 0; //Equals 00000000
-        public const byte LAND_TYPE_OWNED_BY_OTHER = (byte) 1; //Equals 00000001
-        public const byte LAND_TYPE_OWNED_BY_GROUP = (byte) 2; //Equals 00000010
-        public const byte LAND_TYPE_OWNED_BY_REQUESTER = (byte) 3; //Equals 00000011
-        public const byte LAND_TYPE_IS_FOR_SALE = (byte) 4; //Equals 00000100
-        public const byte LAND_TYPE_IS_BEING_AUCTIONED = (byte) 5; //Equals 00000101
-
-        //Flags that when set, a border on the given side will be placed
-        //NOTE: North and East is assumable by the west and south sides (if land to east has a west border, then I have an east border; etc)
-        //This took forever to figure out -- jeesh. /blame LL for even having to send these
-        public const byte LAND_FLAG_PROPERTY_BORDER_WEST = (byte) 64; //Equals 01000000
-        public const byte LAND_FLAG_PROPERTY_BORDER_SOUTH = (byte) 128; //Equals 10000000
-
-        //RequestResults (I think these are right, they seem to work):
-        public const int LAND_RESULT_SINGLE = 0; // The request they made contained only a single piece of land
-        public const int LAND_RESULT_MULTIPLE = 1; // The request they made contained more than a single peice of land
-
-        //ParcelSelectObjects
-        public const int LAND_SELECT_OBJECTS_OWNER = 2;
-        public const int LAND_SELECT_OBJECTS_GROUP = 4;
-        public const int LAND_SELECT_OBJECTS_OTHER = 8;
-
-        //These are other constants. Yay!
-        public const int START_LAND_LOCAL_ID = 1;
-
-        public const float BAN_LINE_SAFETY_HIEGHT = 100;
-
-        #endregion
-
-        #region Member Variables
-
-        public Dictionary<int, Land> landList = new Dictionary<int, Land>();
-        private int lastLandLocalID = START_LAND_LOCAL_ID - 1;
-        private int[,] landIDList = new int[64,64];
-
-        /// <summary>
-        /// Set to true when a prim is moved, created, added. Performs a prim count update
-        /// </summary>
-        public bool landPrimCountTainted = false;
-
-        private readonly Scene m_scene;
-        private readonly RegionInfo m_regInfo;
-
-        public bool allowedForcefulBans = true;
-
-        #endregion
-
-        #region Constructors
-
-        public LandManager(Scene scene, RegionInfo reginfo)
-        {
-            m_scene = scene;
-            m_regInfo = reginfo;
-            landIDList.Initialize();
-            scene.EventManager.OnAvatarEnteringNewParcel +=
-                new EventManager.AvatarEnteringNewParcel(handleAvatarChangingParcel);
-            scene.EventManager.OnClientMovement += new EventManager.ClientMovement(handleAnyClientMovement);
-        }
-
-        #endregion
-
-        #region Member Functions
-
-        #region Land Object From Storage Functions
-
-        public void IncomingLandObjectsFromStorage(List<LandData> data)
-        {
-            for (int i = 0; i < data.Count; i++)
-            {
-                //try
-                //{
-                    IncomingLandObjectFromStorage(data[i]);
-                //}
-                //catch (Exception ex)
-                //{
-                    //m_log.Error("[LandManager]: IncomingLandObjectsFromStorage: Exception: " + ex.ToString());
-                    //throw ex;
-                //}
-            }
-            //foreach (LandData parcel in data)
-            //{
-            //    IncomingLandObjectFromStorage(parcel);
-            //}
-        }
-
-        public void IncomingLandObjectFromStorage(LandData data)
-        {
-            Land new_land = new Land(data.ownerID, data.isGroupOwned, m_scene);
-            new_land.landData = data.Copy();
-            new_land.setLandBitmapFromByteArray();
-            addLandObject(new_land);
-        }
-
-        public void NoLandDataFromStorage()
-        {
-            Console.WriteLine("No LandData in storage! Loading a single, flat parcel instead");
-            resetSimLandObjects();
-        }
-
-        #endregion
-
-        #region Parcel Add/Remove/Get/Create
-
-        /// <summary>
-        /// Creates a basic Parcel object without an owner (a zeroed key)
-        /// </summary>
-        /// <returns></returns>
-        public Land createBaseLand()
-        {
-            return new Land(LLUUID.Zero, false, m_scene);
-        }
-
-        /// <summary>
-        /// Adds a land object to the stored list and adds them to the landIDList to what they own
-        /// </summary>
-        /// <param name="new_land">The land object being added</param>
-        public Land addLandObject(Land new_land)
-        {
-            lastLandLocalID++;
-            new_land.landData.localID = lastLandLocalID;
-            landList.Add(lastLandLocalID, new_land.Copy());
-
-
-            bool[,] landBitmap = new_land.getLandBitmap();
-            int x, y;
-            for (x = 0; x < 64; x++)
-            {
-                for (y = 0; y < 64; y++)
-                {
-                    if (landBitmap[x, y])
-                    {
-                        landIDList[x, y] = lastLandLocalID;
-                    }
-                }
-            }
-            landList[lastLandLocalID].forceUpdateLandInfo();
-            m_scene.EventManager.TriggerLandObjectAdded(new_land, m_scene.RegionInfo.RegionID);
-            return new_land;
-        }
-
-        /// <summary>
-        /// Removes a land object from the list. Will not remove if local_id is still owning an area in landIDList
-        /// </summary>
-        /// <param name="local_id">Land.localID of the peice of land to remove.</param>
-        public void removeLandObject(int local_id)
-        {
-            int x, y;
-            for (x = 0; x < 64; x++)
-            {
-                for (y = 0; y < 64; y++)
-                {
-                    if (landIDList[x, y] == local_id)
-                    {
-                        return;
-                        //throw new Exception("Could not remove land object. Still being used at " + x + ", " + y);
-                    }
-                }
-            }
-
-            m_scene.EventManager.TriggerLandObjectRemoved(landList[local_id].landData.globalID);
-            landList.Remove(local_id);
-        }
-
-        public void updateLandObject(int local_id, LandData newData)
-        {
-            if (landList.ContainsKey(local_id))
-            {
-                landList[local_id].landData = newData.Copy();
-                m_scene.EventManager.TriggerLandObjectUpdated((uint) local_id, landList[local_id]);
-            }
-            else
-            {
-                //throw new Exception("Could not update land object. Local ID '" + local_id + "' does not exist");
-            }
-        }
-
-        private void performFinalLandJoin(Land master, Land slave)
-        {
-            int x, y;
-            bool[,] landBitmapSlave = slave.getLandBitmap();
-            for (x = 0; x < 64; x++)
-            {
-                for (y = 0; y < 64; y++)
-                {
-                    if (landBitmapSlave[x, y])
-                    {
-                        landIDList[x, y] = master.landData.localID;
-                    }
-                }
-            }
-
-            removeLandObject(slave.landData.localID);
-            updateLandObject(master.landData.localID, master.landData);
-        }
-
-        /// <summary>
-        /// Get the land object at the specified point
-        /// </summary>
-        /// <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>
-        /// <returns>Land object at the point supplied</returns>
-        public Land getLandObject(float x_float, float y_float)
-        {
-            int x;
-            int y;
-
-            try
-            {
-                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)));
-            }
-            catch (System.OverflowException)
-            {
-                return null;
-            }
-
-            if (x >= 64 || y >= 64 || x < 0 || y < 0)
-            {
-                return null;
-            }
-            else
-            {
-                // Console.WriteLine("Point (" + x + ", " + y + ") determined from point (" + x_float + ", " + y_float + ")");
-                return landList[landIDList[x, y]];
-            }
-        }
-
-        public Land getLandObject(int x, int y)
-        {
-            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
-                // they happen every time at border crossings
-                throw new Exception("Error: Parcel not found at point " + x + ", " + y);
-            }
-            else
-            {
-                return landList[landIDList[x/4, y/4]];
-            }
-        }
-
-        #endregion
-
-        #region Parcel Modification
-
-        /// <summary>
-        /// Subdivides a piece of land
-        /// </summary>
-        /// <param name="start_x">West Point</param>
-        /// <param name="start_y">South Point</param>
-        /// <param name="end_x">East Point</param>
-        /// <param name="end_y">North Point</param>
-        /// <param name="attempting_user_id">LLUUID of user who is trying to subdivide</param>
-        /// <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)
-        {
-            //First, lets loop through the points and make sure they are all in the same peice of land
-            //Get the land object at start
-            Land startLandObject = null;
-            try
-            {
-                startLandObject = getLandObject(start_x, start_y);
-            }
-            catch (Exception)
-            {
-                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
-
-            //Loop through the points
-            try
-            {
-                int totalX = end_x - start_x;
-                int totalY = end_y - start_y;
-                int x, y;
-                for (y = 0; y < totalY; y++)
-                {
-                    for (x = 0; x < totalX; x++)
-                    {
-                        Land tempLandObject = getLandObject(start_x + x, start_y + y);
-                        if (tempLandObject == null) return false; //No such land object at that point
-                        if (tempLandObject != startLandObject) return false; //Subdividing over 2 land objects; no-no
-                    }
-                }
-            }
-            catch (Exception)
-            {
-                return false; //Exception. For now, lets skip subdivision
-            }
-
-            //If we are still here, then they are subdividing within one piece of land
-            //Check owner
-            if (startLandObject.landData.ownerID != attempting_user_id)
-            {
-                return false; //They cant do this!
-            }
-
-            //Lets create a new land object with bitmap activated at that point (keeping the old land objects info)
-            Land newLand = startLandObject.Copy();
-            newLand.landData.landName = "Subdivision of " + newLand.landData.landName;
-            newLand.landData.globalID = LLUUID.Random();
-
-            newLand.setLandBitmap(Land.getSquareLandBitmap(start_x, start_y, end_x, end_y));
-
-            //Now, lets set the subdivision area of the original to false
-            int startLandObjectIndex = startLandObject.landData.localID;
-            landList[startLandObjectIndex].setLandBitmap(
-                Land.modifyLandBitmapSquare(startLandObject.getLandBitmap(), start_x, start_y, end_x, end_y, false));
-            landList[startLandObjectIndex].forceUpdateLandInfo();
-
-            setPrimsTainted();
-
-            //Now add the new land object
-            Land result = addLandObject(newLand);
-            updateLandObject(startLandObject.landData.localID, startLandObject.landData);
-            result.sendLandUpdateToAvatarsOverMe();
-
-
-            return true;
-        }
-
-        /// <summary>
-        /// Join 2 land objects together
-        /// </summary>
-        /// <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="end_x">x 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>
-        /// <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)
-        {
-            end_x -= 4;
-            end_y -= 4;
-
-            List<Land> selectedLandObjects = new List<Land>();
-            int stepXSelected = 0;
-            int stepYSelected = 0;
-            for (stepYSelected = start_y; stepYSelected <= end_y; stepYSelected += 4)
-            {
-                for (stepXSelected = start_x; stepXSelected <= end_x; stepXSelected += 4)
-                {
-                    Land p = null;
-                    try
-                    {
-                        p = getLandObject(stepXSelected, stepYSelected);
-                    }
-                    catch (Exception)
-                    {
-                        m_log.Error("[LAND]: " + "Unable to get land object for subdivision at x: " + stepXSelected + " y:" + stepYSelected);
-                    }
-                    if (p != null)
-                    {
-                        if (!selectedLandObjects.Contains(p))
-                        {
-                            selectedLandObjects.Add(p);
-                        }
-                    }
-                }
-            }
-            Land masterLandObject = selectedLandObjects[0];
-            selectedLandObjects.RemoveAt(0);
-
-
-            if (selectedLandObjects.Count < 1)
-            {
-                return false; //Only one piece of land selected
-            }
-            if (masterLandObject.landData.ownerID != attempting_user_id)
-            {
-                return false; //Not the same owner
-            }
-            foreach (Land p in selectedLandObjects)
-            {
-                if (p.landData.ownerID != masterLandObject.landData.ownerID)
-                {
-                    return false; //Over multiple users. TODO: make this just ignore this piece of land?
-                }
-            }
-            foreach (Land slaveLandObject in selectedLandObjects)
-            {
-                landList[masterLandObject.landData.localID].setLandBitmap(
-                    Land.mergeLandBitmaps(masterLandObject.getLandBitmap(), slaveLandObject.getLandBitmap()));
-                performFinalLandJoin(masterLandObject, slaveLandObject);
-            }
-
-
-            setPrimsTainted();
-
-            masterLandObject.sendLandUpdateToAvatarsOverMe();
-
-            return true;
-        }
-
-        #endregion
-
-        #region Parcel Updating
-
-        /// <summary>
-        /// Where we send the ParcelOverlay packet to the client
-        /// </summary>
-        /// <param name="remote_client">The object representing the client</param>
-        public void sendParcelOverlay(IClientAPI remote_client)
-        {
-            const int LAND_BLOCKS_PER_PACKET = 1024;
-            int x, y = 0;
-            byte[] byteArray = new byte[LAND_BLOCKS_PER_PACKET];
-            int byteArrayCount = 0;
-            int sequenceID = 0;
-            ParcelOverlayPacket packet;
-
-            for (y = 0; y < 64; y++)
-            {
-                for (x = 0; x < 64; x++)
-                {
-                    byte tempByte = (byte) 0; //This represents the byte for the current 4x4
-                    Land currentParcelBlock = null;
-
-                    try
-                    {
-                        currentParcelBlock = getLandObject(x * 4, y * 4);
-                    }
-                    catch (Exception)
-                    {
-                        m_log.Warn("[LAND]: " + "unable to get land at x: " + (x * 4) + " y: " + (y * 4));
-                    }
-                        
-                    
-                    if (currentParcelBlock != null)
-                    {
-                        if (currentParcelBlock.landData.ownerID == remote_client.AgentId)
-                        {
-                            //Owner Flag
-                            tempByte = Convert.ToByte(tempByte | LAND_TYPE_OWNED_BY_REQUESTER);
-                        }
-                        else if (currentParcelBlock.landData.salePrice > 0 &&
-                                 (currentParcelBlock.landData.authBuyerID == LLUUID.Zero ||
-                                  currentParcelBlock.landData.authBuyerID == remote_client.AgentId))
-                        {
-                            //Sale Flag
-                            tempByte = Convert.ToByte(tempByte | LAND_TYPE_IS_FOR_SALE);
-                        }
-                        else if (currentParcelBlock.landData.ownerID == LLUUID.Zero)
-                        {
-                            //Public Flag
-                            tempByte = Convert.ToByte(tempByte | LAND_TYPE_PUBLIC);
-                        }
-                        else
-                        {
-                            //Other Flag
-                            tempByte = Convert.ToByte(tempByte | LAND_TYPE_OWNED_BY_OTHER);
-                        }
-
-
-                        //Now for border control
-                        try
-                        {
-                            Land westParcel = null;
-                            Land southParcel = null;
-                            if (x > 0)
-                            {
-                                westParcel = getLandObject((x - 1)*4, y*4);
-                            }
-                            if (y > 0)
-                            {
-                                southParcel = getLandObject(x*4, (y - 1)*4);
-                            }
-
-                            if (x == 0)
-                            {
-                                tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_WEST);
-                            }
-                            else if (westParcel != null && westParcel != currentParcelBlock)
-                            {
-                                tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_WEST);
-                            }
-
-                            if (y == 0)
-                            {
-                                tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_SOUTH);
-                            }
-                            else if (southParcel != null && southParcel != currentParcelBlock)
-                            {
-                                tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_SOUTH);
-                            }
-
-                            byteArray[byteArrayCount] = tempByte;
-                            byteArrayCount++;
-                            if (byteArrayCount >= LAND_BLOCKS_PER_PACKET)
-                            {
-                                byteArrayCount = 0;
-                                packet = (ParcelOverlayPacket) PacketPool.Instance.GetPacket(PacketType.ParcelOverlay);
-                                packet.ParcelData.Data = byteArray;
-                                packet.ParcelData.SequenceID = sequenceID;
-                                remote_client.OutPacket((Packet) packet, ThrottleOutPacketType.Task);
-                                sequenceID++;
-                                byteArray = new byte[LAND_BLOCKS_PER_PACKET];
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            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,
-                                                  bool snap_selection, IClientAPI remote_client)
-        {
-            //Get the land objects within the bounds
-            List<Land> temp = new List<Land>();
-            int x, y, i;
-            int inc_x = end_x - start_x;
-            int inc_y = end_y - start_y;
-            for (x = 0; x < inc_x; x++)
-            {
-                for (y = 0; y < inc_y; y++)
-                {
-                    
-                    Land currentParcel = null;
-                    try
-                    {
-                        currentParcel = getLandObject(start_x + x, start_y + y);
-                    }
-                    catch (Exception)
-                    {
-                        m_log.Warn("[LAND]: " + "unable to get land at x: " + (start_x + x) + " y: " + (start_y + y));
-                    }
-                    if (currentParcel != null)
-                    {
-                        if (!temp.Contains(currentParcel))
-                        {
-                            currentParcel.forceUpdateLandInfo();
-                            temp.Add(currentParcel);
-                        }
-                    }
-                }
-            }
-
-            int requestResult = LAND_RESULT_SINGLE;
-            if (temp.Count > 1)
-            {
-                requestResult = LAND_RESULT_MULTIPLE;
-            }
-
-            for (i = 0; i < temp.Count; i++)
-            {
-                temp[i].sendLandProperties(sequence_id, snap_selection, requestResult, remote_client);
-            }
-
-
-            sendParcelOverlay(remote_client);
-        }
-
-        public void handleParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
-        {
-            if (landList.ContainsKey(packet.ParcelData.LocalID))
-            {
-                landList[packet.ParcelData.LocalID].updateLandProperties(packet, remote_client);
-            }
-        }
-
-        public void handleParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client)
-        {
-            subdivide(west, south, east, north, remote_client.AgentId);
-        }
-
-        public void handleParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client)
-        {
-            join(west, south, east, north, remote_client.AgentId);
-        }
-
-        public void handleParcelSelectObjectsRequest(int local_id, int request_type, IClientAPI remote_client)
-        {
-            landList[local_id].sendForceObjectSelect(local_id, request_type, remote_client);
-        }
-
-        public void handleParcelObjectOwnersRequest(int local_id, IClientAPI remote_client)
-        {
-            landList[local_id].sendLandObjectOwners(remote_client);
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Resets the sim to the default land object (full sim piece of land owned by the default user)
-        /// </summary>
-        public void resetSimLandObjects()
-        {
-            //Remove all the land objects in the sim and add a blank, full sim land object set to public
-            landList.Clear();
-            lastLandLocalID = START_LAND_LOCAL_ID - 1;
-            landIDList.Initialize();
-
-            Land fullSimParcel = new Land(LLUUID.Zero, false, m_scene);
-
-            fullSimParcel.setLandBitmap(Land.getSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
-            fullSimParcel.landData.ownerID = m_regInfo.MasterAvatarAssignedUUID;
-
-            addLandObject(fullSimParcel);
-        }
-
-        public List<Land> parcelsNearPoint(LLVector3 position)
-        {
-            List<Land> parcelsNear = new List<Land>();
-            int x, y;
-            for (x = -4; x <= 4; x += 4)
-            {
-                for (y = -4; y <= 4; y += 4)
-                {
-                    Land check = getLandObject(position.X + x, position.Y + y);
-                    if (check != null)
-                    {
-                        if (!parcelsNear.Contains(check))
-                        {
-                            parcelsNear.Add(check);
-                        }
-                    }
-                }
-            }
-
-            return parcelsNear;
-        }
-
-        public void sendYouAreBannedNotice(ScenePresence avatar)
-        {
-            if (allowedForcefulBans)
-            {
-                avatar.ControllingClient.SendAlertMessage(
-                    "You are not allowed on this parcel because you are banned. Please go away. <3 OpenSim Developers");
-
-                avatar.PhysicsActor.Position =
-                    new PhysicsVector(avatar.lastKnownAllowedPosition.x, avatar.lastKnownAllowedPosition.y,
-                                      avatar.lastKnownAllowedPosition.z);
-                avatar.PhysicsActor.Velocity = new PhysicsVector(0, 0, 0);
-            }
-            else
-            {
-                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");
-            }
-        }
-
-        public void handleAvatarChangingParcel(ScenePresence avatar, int localLandID, LLUUID regionID)
-        {
-            if (m_scene.RegionInfo.RegionID == regionID)
-            {
-                if (landList[localLandID] != null)
-                {
-                    Land parcelAvatarIsEntering = landList[localLandID];
-                    if (avatar.AbsolutePosition.Z < BAN_LINE_SAFETY_HIEGHT)
-                    {
-                        if (parcelAvatarIsEntering.isBannedFromLand(avatar.UUID))
-                        {
-                            sendYouAreBannedNotice(avatar);
-                        }
-                        else if (parcelAvatarIsEntering.isRestrictedFromLand(avatar.UUID))
-                        {
-                            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");
-                        }
-                        else
-                        {
-                            avatar.sentMessageAboutRestrictedParcelFlyingDown = true;
-                        }
-                    }
-                    else
-                    {
-                        avatar.sentMessageAboutRestrictedParcelFlyingDown = true;
-                    }
-                }
-            }
-        }
-
-        public void sendOutNearestBanLine(IClientAPI avatar)
-        {
-            List<ScenePresence> avatars = m_scene.GetAvatars();
-            foreach (ScenePresence presence in avatars)
-            {
-                if (presence.UUID == avatar.AgentId)
-                {
-
-                    List<Land> checkLandParcels = parcelsNearPoint(presence.AbsolutePosition);
-                    foreach (Land checkBan in checkLandParcels)
-                    {
-                        if (checkBan.isBannedFromLand(avatar.AgentId))
-                        {
-                            checkBan.sendLandProperties(-30000, false, (int) ParcelManager.ParcelResult.Single, avatar);
-                            return; //Only send one
-                        }
-                        else if (checkBan.isRestrictedFromLand(avatar.AgentId))
-                        {
-                            checkBan.sendLandProperties(-40000, false, (int) ParcelManager.ParcelResult.Single, avatar);
-                            return; //Only send one
-                        }
-                    }
-                    return;
-                }
-            }
-        }
-
-        public void sendLandUpdate(ScenePresence avatar, bool force)
-        {
-            Land over  = null;
-            try
-            {
-                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))));
-            }
-            catch (Exception)
-            {
-                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 (force)
-                {
-                    if (!avatar.IsChildAgent)
-                    {
-                        over.sendLandUpdateToClient(avatar.ControllingClient);
-                        m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.landData.localID,
-                                                                            m_scene.RegionInfo.RegionID);
-                    }
-                }
-
-                if (avatar.currentParcelUUID != over.landData.globalID)
-                {
-                    if (!avatar.IsChildAgent)
-                    {
-                        over.sendLandUpdateToClient(avatar.ControllingClient);
-                        avatar.currentParcelUUID = over.landData.globalID;
-                        m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.landData.localID,
-                                                                            m_scene.RegionInfo.RegionID);
-                    }
-                }
-            }
-        }
-        public void sendLandUpdate(ScenePresence avatar)
-        {
-            sendLandUpdate(avatar, false);
-
-        }
-        public void handleSignificantClientMovement(IClientAPI remote_client)
-        {
-            ScenePresence clientAvatar = m_scene.GetScenePresence(remote_client.AgentId);
-
-            if (clientAvatar != null)
-            {
-                sendLandUpdate(clientAvatar);
-                sendOutNearestBanLine(remote_client);
-                Land parcel = getLandObject(clientAvatar.AbsolutePosition.X, clientAvatar.AbsolutePosition.Y);
-                if (parcel != null)
-                {
-                    if (clientAvatar.AbsolutePosition.Z < BAN_LINE_SAFETY_HIEGHT &&
-                        clientAvatar.sentMessageAboutRestrictedParcelFlyingDown)
-                    {
-                        handleAvatarChangingParcel(clientAvatar, parcel.landData.localID, m_scene.RegionInfo.RegionID);
-                            //They are going below the safety line!
-                        if (!parcel.isBannedFromLand(clientAvatar.UUID))
-                        {
-                            clientAvatar.sentMessageAboutRestrictedParcelFlyingDown = false;
-                        }
-                    }
-                    else if (clientAvatar.AbsolutePosition.Z < BAN_LINE_SAFETY_HIEGHT &&
-                             parcel.isBannedFromLand(clientAvatar.UUID))
-                    {
-                        sendYouAreBannedNotice(clientAvatar);
-                    }
-                }
-            }
-        }
-
-        public void handleAnyClientMovement(ScenePresence avatar)
-            //Like handleSignificantClientMovement, but called with an AgentUpdate regardless of distance. 
-        {
-            Land over = getLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
-            if (over != null)
-            {
-                if (!over.isBannedFromLand(avatar.UUID) || avatar.AbsolutePosition.Z >= BAN_LINE_SAFETY_HIEGHT)
-                {
-                    avatar.lastKnownAllowedPosition =
-                        new Vector3(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z);
-                }
-            }
-        }
-
-
-        public void handleParcelAccessRequest(LLUUID agentID, LLUUID sessionID, uint flags, int sequenceID,
-                                              int landLocalID, IClientAPI remote_client)
-        {
-            if (landList.ContainsKey(landLocalID))
-            {
-                landList[landLocalID].sendAccessList(agentID, sessionID, flags, sequenceID, remote_client);
-            }
-        }
-
-        public void handleParcelAccessUpdateRequest(LLUUID agentID, LLUUID sessionID, uint flags, int landLocalID,
-                                                    List<ParcelManager.ParcelAccessEntry> entries,
-                                                    IClientAPI remote_client)
-        {
-            if (landList.ContainsKey(landLocalID))
-            {
-                if (agentID == landList[landLocalID].landData.ownerID)
-                {
-                    landList[landLocalID].updateAccessList(flags, entries, remote_client);
-                }
-            }
-            else
-            {
-                Console.WriteLine("INVALID LOCAL LAND ID");
-            }
-        }
-
-        public void resetAllLandPrimCounts()
-        {
-            foreach (Land p in landList.Values)
-            {
-                p.resetLandPrimCounts();
-            }
-        }
-
-        public void setPrimsTainted()
-        {
-            landPrimCountTainted = true;
-        }
-
-        public void addPrimToLandPrimCounts(SceneObjectGroup obj)
-        {
-            LLVector3 position = obj.AbsolutePosition;
-            Land landUnderPrim = getLandObject(position.X, position.Y);
-            if (landUnderPrim != null)
-            {
-                landUnderPrim.addPrimToCount(obj);
-            }
-        }
-
-        public void removePrimFromLandPrimCounts(SceneObjectGroup obj)
-        {
-            foreach (Land p in landList.Values)
-            {
-                p.removePrimFromCount(obj);
-            }
-        }
-
-        public void finalizeLandPrimCountUpdate()
-        {
-            //Get Simwide prim count for owner
-            Dictionary<LLUUID, List<Land>> landOwnersAndParcels = new Dictionary<LLUUID, List<Land>>();
-            foreach (Land p in landList.Values)
-            {
-                if (!landOwnersAndParcels.ContainsKey(p.landData.ownerID))
-                {
-                    List<Land> tempList = new List<Land>();
-                    tempList.Add(p);
-                    landOwnersAndParcels.Add(p.landData.ownerID, tempList);
-                }
-                else
-                {
-                    landOwnersAndParcels[p.landData.ownerID].Add(p);
-                }
-            }
-
-            foreach (LLUUID owner in landOwnersAndParcels.Keys)
-            {
-                int simArea = 0;
-                int simPrims = 0;
-                foreach (Land p in landOwnersAndParcels[owner])
-                {
-                    simArea += p.landData.area;
-                    simPrims += p.landData.ownerPrims + p.landData.otherPrims + p.landData.groupPrims +
-                                p.landData.selectedPrims;
-                }
-
-                foreach (Land p in landOwnersAndParcels[owner])
-                {
-                    p.landData.simwideArea = simArea;
-                    p.landData.simwidePrims = simPrims;
-                }
-            }
-        }
-
-        #endregion
-    }
-
-    #endregion
-}
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+using Axiom.Math;

+using libsecondlife;

+using libsecondlife.Packets;

+using OpenSim.Framework;

+using OpenSim.Framework.Console;

+using OpenSim.Region.Environment.Scenes;

+using OpenSim.Region.Environment.Interfaces;

+using OpenSim.Region.Physics.Manager;

+

+namespace OpenSim.Region.Environment.Modules.LandManagement

+{

+    public class LandChannel : ILandChannel

+    {

+        #region Constants

+

+        //Land types set with flags in ParcelOverlay.

+        //Only one of these can be used. 

+        public const byte LAND_TYPE_PUBLIC = (byte)0; //Equals 00000000

+        public const byte LAND_TYPE_OWNED_BY_OTHER = (byte)1; //Equals 00000001

+        public const byte LAND_TYPE_OWNED_BY_GROUP = (byte)2; //Equals 00000010

+        public const byte LAND_TYPE_OWNED_BY_REQUESTER = (byte)3; //Equals 00000011

+        public const byte LAND_TYPE_IS_FOR_SALE = (byte)4; //Equals 00000100

+        public const byte LAND_TYPE_IS_BEING_AUCTIONED = (byte)5; //Equals 00000101

+

+        //Flags that when set, a border on the given side will be placed

+        //NOTE: North and East is assumable by the west and south sides (if land to east has a west border, then I have an east border; etc)

+        //This took forever to figure out -- jeesh. /blame LL for even having to send these

+        public const byte LAND_FLAG_PROPERTY_BORDER_WEST = (byte)64; //Equals 01000000

+        public const byte LAND_FLAG_PROPERTY_BORDER_SOUTH = (byte)128; //Equals 10000000

+

+        //RequestResults (I think these are right, they seem to work):

+        public const int LAND_RESULT_SINGLE = 0; // The request they made contained only a single piece of land

+        public const int LAND_RESULT_MULTIPLE = 1; // The request they made contained more than a single peice of land

+

+        //ParcelSelectObjects

+        public const int LAND_SELECT_OBJECTS_OWNER = 2;

+        public const int LAND_SELECT_OBJECTS_GROUP = 4;

+        public const int LAND_SELECT_OBJECTS_OTHER = 8;

+

+        //These are other constants. Yay!

+        public const int START_LAND_LOCAL_ID = 1;

+

+        public const float BAN_LINE_SAFETY_HIEGHT = 100;

+

+        #endregion

+

+        private Scene m_scene;

+

+        private Dictionary<int, ILandObject> landList = new Dictionary<int, ILandObject>();

+        private int lastLandLocalID = START_LAND_LOCAL_ID - 1;

+        private int[,] landIDList = new int[64, 64];

+

+        private bool landPrimCountTainted = false;

+

+        private bool m_allowedForcefulBans = true;

+        public bool allowedForcefulBans

+        {

+            get

+            {

+                return m_allowedForcefulBans;

+            }

+            set

+            {

+                m_allowedForcefulBans = value;

+            }

+        }

+

+        public LandChannel(Scene scene)

+        {

+            m_scene = scene;

+            landIDList.Initialize();

+        }

+        #region Land Object From Storage Functions

+

+        public void IncomingLandObjectsFromStorage(List<LandData> data)

+        {

+            for (int i = 0; i < data.Count; i++)

+            {

+                //try

+                //{

+                IncomingLandObjectFromStorage(data[i]);

+                //}

+                //catch (Exception ex)

+                //{

+                //m_log.Error("[LandManager]: IncomingLandObjectsFromStorage: Exception: " + ex.ToString());

+                //throw ex;

+                //}

+            }

+            //foreach (LandData parcel in data)

+            //{

+            //    IncomingLandObjectFromStorage(parcel);

+            //}

+        }

+

+        public void IncomingLandObjectFromStorage(LandData data)

+        {

+            ILandObject new_land = new LandObject(data.ownerID, data.isGroupOwned, m_scene);

+            new_land.landData = data.Copy();

+            new_land.setLandBitmapFromByteArray();

+            addLandObject(new_land);

+        }

+

+        public void NoLandDataFromStorage()

+        {

+            resetSimLandObjects();

+        }

+

+        #endregion 

+

+        #region Parcel Add/Remove/Get/Create

+

+        /// <summary>

+        /// Creates a basic Parcel object without an owner (a zeroed key)

+        /// </summary>

+        /// <returns></returns>

+        public ILandObject createBaseLand()

+        {

+            return new LandObject(LLUUID.Zero, false, m_scene);

+        }

+

+        /// <summary>

+        /// Adds a land object to the stored list and adds them to the landIDList to what they own

+        /// </summary>

+        /// <param name="new_land">The land object being added</param>

+        public ILandObject addLandObject(ILandObject new_land)

+        {

+            lastLandLocalID++;

+            new_land.landData.localID = lastLandLocalID;

+            landList.Add(lastLandLocalID, (LandObject)new_land.Copy());

+

+

+            bool[,] landBitmap = new_land.getLandBitmap();

+            int x, y;

+            for (x = 0; x < 64; x++)

+            {

+                for (y = 0; y < 64; y++)

+                {

+                    if (landBitmap[x, y])

+                    {

+                        landIDList[x, y] = lastLandLocalID;

+                    }

+                }

+            }

+            landList[lastLandLocalID].forceUpdateLandInfo();

+            m_scene.EventManager.TriggerLandObjectAdded(new_land);

+            return new_land;

+        }

+

+        /// <summary>

+        /// Removes a land object from the list. Will not remove if local_id is still owning an area in landIDList

+        /// </summary>

+        /// <param name="local_id">Land.localID of the peice of land to remove.</param>

+        public void removeLandObject(int local_id)

+        {

+            int x, y;

+            for (x = 0; x < 64; x++)

+            {

+                for (y = 0; y < 64; y++)

+                {

+                    if (landIDList[x, y] == local_id)

+                    {

+                        return;

+                        //throw new Exception("Could not remove land object. Still being used at " + x + ", " + y);

+                    }

+                }

+            }

+

+            m_scene.EventManager.TriggerLandObjectRemoved(landList[local_id].landData.globalID);

+            landList.Remove(local_id);

+        }

+

+        public void updateLandObject(int local_id, LandData newData)

+        {

+            if (landList.ContainsKey(local_id))

+            {

+                landList[local_id].landData = newData.Copy();

+                m_scene.EventManager.TriggerLandObjectUpdated((uint)local_id, landList[local_id]);

+            }

+        }

+

+        private void performFinalLandJoin(ILandObject master, ILandObject slave)

+        {

+            int x, y;

+            bool[,] landBitmapSlave = slave.getLandBitmap();

+            for (x = 0; x < 64; x++)

+            {

+                for (y = 0; y < 64; y++)

+                {

+                    if (landBitmapSlave[x, y])

+                    {

+                        landIDList[x, y] = master.landData.localID;

+                    }

+                }

+            }

+

+            removeLandObject(slave.landData.localID);

+            updateLandObject(master.landData.localID, master.landData);

+        }

+

+        /// <summary>

+        /// Get the land object at the specified point

+        /// </summary>

+        /// <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>

+        /// <returns>Land object at the point supplied</returns>

+        public ILandObject getLandObject(float x_float, float y_float)

+        {

+            int x;

+            int y;

+

+            try

+            {

+                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)));

+            }

+            catch (System.OverflowException)

+            {

+                return null;

+            }

+

+            if (x >= 64 || y >= 64 || x < 0 || y < 0)

+            {

+                return null;

+            }

+            else

+            {

+                return landList[landIDList[x, y]];

+            }

+        }

+

+        public ILandObject getLandObject(int x, int y)

+        {

+            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

+                // they happen every time at border crossings

+                throw new Exception("Error: Parcel not found at point " + x + ", " + y);

+            }

+            else

+            {

+                return landList[landIDList[x / 4, y / 4]];

+            }

+        }

+

+        #endregion

+

+        #region Parcel Modification

+

+        /// <summary>

+        /// Subdivides a piece of land

+        /// </summary>

+        /// <param name="start_x">West Point</param>

+        /// <param name="start_y">South Point</param>

+        /// <param name="end_x">East Point</param>

+        /// <param name="end_y">North Point</param>

+        /// <param name="attempting_user_id">LLUUID of user who is trying to subdivide</param>

+        /// <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)

+        {

+            //First, lets loop through the points and make sure they are all in the same peice of land

+            //Get the land object at start

+            ILandObject startLandObject = null;

+            try

+            {

+                startLandObject = getLandObject(start_x, start_y);

+            }

+            catch (Exception)

+            {

+                //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

+

+            //Loop through the points

+            try

+            {

+                int totalX = end_x - start_x;

+                int totalY = end_y - start_y;

+                int x, y;

+                for (y = 0; y < totalY; y++)

+                {

+                    for (x = 0; x < totalX; x++)

+                    {

+                        ILandObject tempLandObject = getLandObject(start_x + x, start_y + y);

+                        if (tempLandObject == null) return false; //No such land object at that point

+                        if (tempLandObject != startLandObject) return false; //Subdividing over 2 land objects; no-no

+                    }

+                }

+            }

+            catch (Exception)

+            {

+                return false; //Exception. For now, lets skip subdivision

+            }

+

+            //If we are still here, then they are subdividing within one piece of land

+            //Check owner

+            if (startLandObject.landData.ownerID != attempting_user_id)

+            {

+                return false; //They cant do this!

+            }

+

+            //Lets create a new land object with bitmap activated at that point (keeping the old land objects info)

+            ILandObject newLand = startLandObject.Copy();

+            newLand.landData.landName = "Subdivision of " + newLand.landData.landName;

+            newLand.landData.globalID = LLUUID.Random();

+

+            newLand.setLandBitmap(newLand.getSquareLandBitmap(start_x, start_y, end_x, end_y));

+

+            //Now, lets set the subdivision area of the original to false

+            int startLandObjectIndex = startLandObject.landData.localID;

+            landList[startLandObjectIndex].setLandBitmap(

+                newLand.modifyLandBitmapSquare(startLandObject.getLandBitmap(), start_x, start_y, end_x, end_y, false));

+            landList[startLandObjectIndex].forceUpdateLandInfo();

+

+            setPrimsTainted();

+

+            //Now add the new land object

+            ILandObject result = addLandObject(newLand);

+            updateLandObject(startLandObject.landData.localID, startLandObject.landData);

+            result.sendLandUpdateToAvatarsOverMe();

+

+

+            return true;

+        }

+

+        /// <summary>

+        /// Join 2 land objects together

+        /// </summary>

+        /// <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="end_x">x 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>

+        /// <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)

+        {

+            end_x -= 4;

+            end_y -= 4;

+

+            List<ILandObject> selectedLandObjects = new List<ILandObject>();

+            int stepXSelected = 0;

+            int stepYSelected = 0;

+            for (stepYSelected = start_y; stepYSelected <= end_y; stepYSelected += 4)

+            {

+                for (stepXSelected = start_x; stepXSelected <= end_x; stepXSelected += 4)

+                {

+                    ILandObject p = null;

+                    try

+                    {

+                        p = getLandObject(stepXSelected, stepYSelected);

+                    }

+                    catch (Exception)

+                    {

+                        //m_log.Error("[LAND]: " + "Unable to get land object for subdivision at x: " + stepXSelected + " y:" + stepYSelected);

+                    }

+                    if (p != null)

+                    {

+                        if (!selectedLandObjects.Contains(p))

+                        {

+                            selectedLandObjects.Add(p);

+                        }

+                    }

+                }

+            }

+            ILandObject masterLandObject = selectedLandObjects[0];

+            selectedLandObjects.RemoveAt(0);

+

+

+            if (selectedLandObjects.Count < 1)

+            {

+                return false; //Only one piece of land selected

+            }

+            if (masterLandObject.landData.ownerID != attempting_user_id)

+            {

+                return false; //Not the same owner

+            }

+            foreach (ILandObject p in selectedLandObjects)

+            {

+                if (p.landData.ownerID != masterLandObject.landData.ownerID)

+                {

+                    return false; //Over multiple users. TODO: make this just ignore this piece of land?

+                }

+            }

+            foreach (ILandObject slaveLandObject in selectedLandObjects)

+            {

+                landList[masterLandObject.landData.localID].setLandBitmap(

+                    slaveLandObject.mergeLandBitmaps(masterLandObject.getLandBitmap(), slaveLandObject.getLandBitmap()));

+                performFinalLandJoin(masterLandObject, slaveLandObject);

+            }

+

+

+            setPrimsTainted();

+

+            masterLandObject.sendLandUpdateToAvatarsOverMe();

+

+            return true;

+        }

+

+        public void resetAllLandPrimCounts()

+        {

+            foreach (LandObject p in landList.Values)

+            {

+                p.resetLandPrimCounts();

+            }

+        }

+

+        public void setPrimsTainted()

+        {

+            landPrimCountTainted = true;

+        }

+

+        public bool isLandPrimCountTainted()

+        {

+            return landPrimCountTainted;

+        }

+

+        public void addPrimToLandPrimCounts(SceneObjectGroup obj)

+        {

+            LLVector3 position = obj.AbsolutePosition;

+            ILandObject landUnderPrim = getLandObject(position.X, position.Y);

+            if (landUnderPrim != null)

+            {

+                landUnderPrim.addPrimToCount(obj);

+            }

+        }

+

+        public void removePrimFromLandPrimCounts(SceneObjectGroup obj)

+        {

+            foreach (LandObject p in landList.Values)

+            {

+                p.removePrimFromCount(obj);

+            }

+        }

+

+        public void finalizeLandPrimCountUpdate()

+        {

+            //Get Simwide prim count for owner

+            Dictionary<LLUUID, List<LandObject>> landOwnersAndParcels = new Dictionary<LLUUID, List<LandObject>>();

+            foreach (LandObject p in landList.Values)

+            {

+                if (!landOwnersAndParcels.ContainsKey(p.landData.ownerID))

+                {

+                    List<LandObject> tempList = new List<LandObject>();

+                    tempList.Add(p);

+                    landOwnersAndParcels.Add(p.landData.ownerID, tempList);

+                }

+                else

+                {

+                    landOwnersAndParcels[p.landData.ownerID].Add(p);

+                }

+            }

+

+            foreach (LLUUID owner in landOwnersAndParcels.Keys)

+            {

+                int simArea = 0;

+                int simPrims = 0;

+                foreach (LandObject p in landOwnersAndParcels[owner])

+                {

+                    simArea += p.landData.area;

+                    simPrims += p.landData.ownerPrims + p.landData.otherPrims + p.landData.groupPrims +

+                                p.landData.selectedPrims;

+                }

+

+                foreach (LandObject p in landOwnersAndParcels[owner])

+                {

+                    p.landData.simwideArea = simArea;

+                    p.landData.simwidePrims = simPrims;

+                }

+            }

+        }

+

+        public void updateLandPrimCounts()

+        {

+            foreach (EntityBase obj in m_scene.Entities.Values)

+            {

+                if (obj is SceneObjectGroup)

+                {

+                    m_scene.EventManager.TriggerParcelPrimCountAdd((SceneObjectGroup)obj);

+                }

+            }

+        }

+

+        public void performParcelPrimCountUpdate()

+        {

+            resetAllLandPrimCounts();

+            m_scene.EventManager.TriggerParcelPrimCountUpdate();

+            finalizeLandPrimCountUpdate();

+            landPrimCountTainted = false;

+        }

+        #endregion

+

+        #region Parcel Updating

+

+        /// <summary>

+        /// Where we send the ParcelOverlay packet to the client

+        /// </summary>

+        /// <param name="remote_client">The object representing the client</param>

+        public void sendParcelOverlay(IClientAPI remote_client)

+        {

+            const int LAND_BLOCKS_PER_PACKET = 1024;

+            int x, y = 0;

+            byte[] byteArray = new byte[LAND_BLOCKS_PER_PACKET];

+            int byteArrayCount = 0;

+            int sequenceID = 0;

+            ParcelOverlayPacket packet;

+

+            for (y = 0; y < 64; y++)

+            {

+                for (x = 0; x < 64; x++)

+                {

+                    byte tempByte = (byte)0; //This represents the byte for the current 4x4

+                    ILandObject currentParcelBlock = null;

+

+                    try

+                    {

+                        currentParcelBlock = getLandObject(x * 4, y * 4);

+                    }

+                    catch (Exception)

+                    {

+                        //m_log.Warn("[LAND]: " + "unable to get land at x: " + (x * 4) + " y: " + (y * 4));

+                    }

+

+

+                    if (currentParcelBlock != null)

+                    {

+                        if (currentParcelBlock.landData.ownerID == remote_client.AgentId)

+                        {

+                            //Owner Flag

+                            tempByte = Convert.ToByte(tempByte | LAND_TYPE_OWNED_BY_REQUESTER);

+                        }

+                        else if (currentParcelBlock.landData.salePrice > 0 &&

+                                 (currentParcelBlock.landData.authBuyerID == LLUUID.Zero ||

+                                  currentParcelBlock.landData.authBuyerID == remote_client.AgentId))

+                        {

+                            //Sale Flag

+                            tempByte = Convert.ToByte(tempByte | LAND_TYPE_IS_FOR_SALE);

+                        }

+                        else if (currentParcelBlock.landData.ownerID == LLUUID.Zero)

+                        {

+                            //Public Flag

+                            tempByte = Convert.ToByte(tempByte | LAND_TYPE_PUBLIC);

+                        }

+                        else

+                        {

+                            //Other Flag

+                            tempByte = Convert.ToByte(tempByte | LAND_TYPE_OWNED_BY_OTHER);

+                        }

+

+

+                        //Now for border control

+                        try

+                        {

+                            ILandObject westParcel = null;

+                            ILandObject southParcel = null;

+                            if (x > 0)

+                            {

+                                westParcel = getLandObject((x - 1) * 4, y * 4);

+                            }

+                            if (y > 0)

+                            {

+                                southParcel = getLandObject(x * 4, (y - 1) * 4);

+                            }

+

+                            if (x == 0)

+                            {

+                                tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_WEST);

+                            }

+                            else if (westParcel != null && westParcel != currentParcelBlock)

+                            {

+                                tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_WEST);

+                            }

+

+                            if (y == 0)

+                            {

+                                tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_SOUTH);

+                            }

+                            else if (southParcel != null && southParcel != currentParcelBlock)

+                            {

+                                tempByte = Convert.ToByte(tempByte | LAND_FLAG_PROPERTY_BORDER_SOUTH);

+                            }

+

+                            byteArray[byteArrayCount] = tempByte;

+                            byteArrayCount++;

+                            if (byteArrayCount >= LAND_BLOCKS_PER_PACKET)

+                            {

+                                byteArrayCount = 0;

+                                packet = (ParcelOverlayPacket)PacketPool.Instance.GetPacket(PacketType.ParcelOverlay);

+                                packet.ParcelData.Data = byteArray;

+                                packet.ParcelData.SequenceID = sequenceID;

+                                remote_client.OutPacket((Packet)packet, ThrottleOutPacketType.Task);

+                                sequenceID++;

+                                byteArray = new byte[LAND_BLOCKS_PER_PACKET];

+                            }

+                        }

+                        catch (Exception e)

+                        {

+                            //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,

+                                                  bool snap_selection, IClientAPI remote_client)

+        {

+            //Get the land objects within the bounds

+            List<ILandObject> temp = new List<ILandObject>();

+            int x, y, i;

+            int inc_x = end_x - start_x;

+            int inc_y = end_y - start_y;

+            for (x = 0; x < inc_x; x++)

+            {

+                for (y = 0; y < inc_y; y++)

+                {

+

+                    ILandObject currentParcel = null;

+                    try

+                    {

+                        currentParcel = getLandObject(start_x + x, start_y + y);

+                    }

+                    catch (Exception)

+                    {

+                        //m_log.Warn("[LAND]: " + "unable to get land at x: " + (start_x + x) + " y: " + (start_y + y));

+                    }

+                    if (currentParcel != null)

+                    {

+                        if (!temp.Contains(currentParcel))

+                        {

+                            currentParcel.forceUpdateLandInfo();

+                            temp.Add(currentParcel);

+                        }

+                    }

+                }

+            }

+

+            int requestResult = LAND_RESULT_SINGLE;

+            if (temp.Count > 1)

+            {

+                requestResult = LAND_RESULT_MULTIPLE;

+            }

+

+            for (i = 0; i < temp.Count; i++)

+            {

+                temp[i].sendLandProperties(sequence_id, snap_selection, requestResult, remote_client);

+            }

+

+

+            sendParcelOverlay(remote_client);

+        }

+

+        public void handleParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)

+        {

+            if (landList.ContainsKey(packet.ParcelData.LocalID))

+            {

+                landList[packet.ParcelData.LocalID].updateLandProperties(packet, remote_client);

+            }

+        }

+

+        public void handleParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client)

+        {

+            subdivide(west, south, east, north, remote_client.AgentId);

+        }

+

+        public void handleParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client)

+        {

+            join(west, south, east, north, remote_client.AgentId);

+        }

+

+        public void handleParcelSelectObjectsRequest(int local_id, int request_type, IClientAPI remote_client)

+        {

+            landList[local_id].sendForceObjectSelect(local_id, request_type, remote_client);

+        }

+

+        public void handleParcelObjectOwnersRequest(int local_id, IClientAPI remote_client)

+        {

+            landList[local_id].sendLandObjectOwners(remote_client);

+        }

+

+        #endregion

+

+        /// <summary>

+        /// Resets the sim to the default land object (full sim piece of land owned by the default user)

+        /// </summary>

+        public void resetSimLandObjects()

+        {

+            //Remove all the land objects in the sim and add a blank, full sim land object set to public

+            landList.Clear();

+            lastLandLocalID = START_LAND_LOCAL_ID - 1;

+            landIDList.Initialize();

+

+            ILandObject fullSimParcel = new LandObject(LLUUID.Zero, false, m_scene);

+

+            fullSimParcel.setLandBitmap(fullSimParcel.getSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));

+            fullSimParcel.landData.ownerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;

+

+            addLandObject(fullSimParcel);

+        }

+

+        public List<ILandObject> parcelsNearPoint(LLVector3 position)

+        {

+            List<ILandObject> parcelsNear = new List<ILandObject>();

+            int x, y;

+            for (x = -4; x <= 4; x += 4)

+            {

+                for (y = -4; y <= 4; y += 4)

+                {

+                    ILandObject check = getLandObject(position.X + x, position.Y + y);

+                    if (check != null)

+                    {

+                        if (!parcelsNear.Contains(check))

+                        {

+                            parcelsNear.Add(check);

+                        }

+                    }

+                }

+            }

+

+            return parcelsNear;

+        }

+

+        public void sendYouAreBannedNotice(ScenePresence avatar)

+        {

+            if (allowedForcefulBans)

+            {

+                avatar.ControllingClient.SendAlertMessage(

+                    "You are not allowed on this parcel because you are banned. Please go away. <3 OpenSim Developers");

+

+                avatar.PhysicsActor.Position =

+                    new PhysicsVector(avatar.lastKnownAllowedPosition.x, avatar.lastKnownAllowedPosition.y,

+                                      avatar.lastKnownAllowedPosition.z);

+                avatar.PhysicsActor.Velocity = new PhysicsVector(0, 0, 0);

+            }

+            else

+            {

+                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");

+            }

+        }

+

+        public void handleAvatarChangingParcel(ScenePresence avatar, int localLandID, LLUUID regionID)

+        {

+            if (m_scene.RegionInfo.RegionID == regionID)

+            {

+                if (landList[localLandID] != null)

+                {

+                    ILandObject parcelAvatarIsEntering = landList[localLandID];

+                    if (avatar.AbsolutePosition.Z < BAN_LINE_SAFETY_HIEGHT)

+                    {

+                        if (parcelAvatarIsEntering.isBannedFromLand(avatar.UUID))

+                        {

+                            sendYouAreBannedNotice(avatar);

+                        }

+                        else if (parcelAvatarIsEntering.isRestrictedFromLand(avatar.UUID))

+                        {

+                            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");

+                        }

+                        else

+                        {

+                            avatar.sentMessageAboutRestrictedParcelFlyingDown = true;

+                        }

+                    }

+                    else

+                    {

+                        avatar.sentMessageAboutRestrictedParcelFlyingDown = true;

+                    }

+                }

+            }

+        }

+

+        public void sendOutNearestBanLine(IClientAPI avatar)

+        {

+            List<ScenePresence> avatars = m_scene.GetAvatars();

+            foreach (ScenePresence presence in avatars)

+            {

+                if (presence.UUID == avatar.AgentId)

+                {

+

+                    List<ILandObject> checkLandParcels = parcelsNearPoint(presence.AbsolutePosition);

+                    foreach (ILandObject checkBan in checkLandParcels)

+                    {

+                        if (checkBan.isBannedFromLand(avatar.AgentId))

+                        {

+                            checkBan.sendLandProperties(-30000, false, (int)ParcelManager.ParcelResult.Single, avatar);

+                            return; //Only send one

+                        }

+                        else if (checkBan.isRestrictedFromLand(avatar.AgentId))

+                        {

+                            checkBan.sendLandProperties(-40000, false, (int)ParcelManager.ParcelResult.Single, avatar);

+                            return; //Only send one

+                        }

+                    }

+                    return;

+                }

+            }

+        }

+

+        public void sendLandUpdate(ScenePresence avatar, bool force)

+        {

+            ILandObject over = null;

+            try

+            {

+                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))));

+            }

+            catch (Exception)

+            {

+                //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 (force)

+                {

+                    if (!avatar.IsChildAgent)

+                    {

+                        over.sendLandUpdateToClient(avatar.ControllingClient);

+                        m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.landData.localID,

+                                                                            m_scene.RegionInfo.RegionID);

+                    }

+                }

+

+                if (avatar.currentParcelUUID != over.landData.globalID)

+                {

+                    if (!avatar.IsChildAgent)

+                    {

+                        over.sendLandUpdateToClient(avatar.ControllingClient);

+                        avatar.currentParcelUUID = over.landData.globalID;

+                        m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.landData.localID,

+                                                                            m_scene.RegionInfo.RegionID);

+                    }

+                }

+            }

+        }

+        public void sendLandUpdate(ScenePresence avatar)

+        {

+            sendLandUpdate(avatar, false);

+

+        }

+        public void handleSignificantClientMovement(IClientAPI remote_client)

+        {

+            ScenePresence clientAvatar = m_scene.GetScenePresence(remote_client.AgentId);

+

+            if (clientAvatar != null)

+            {

+                sendLandUpdate(clientAvatar);

+                sendOutNearestBanLine(remote_client);

+                ILandObject parcel = getLandObject(clientAvatar.AbsolutePosition.X, clientAvatar.AbsolutePosition.Y);

+                if (parcel != null)

+                {

+                    if (clientAvatar.AbsolutePosition.Z < BAN_LINE_SAFETY_HIEGHT &&

+                        clientAvatar.sentMessageAboutRestrictedParcelFlyingDown)

+                    {

+                        handleAvatarChangingParcel(clientAvatar, parcel.landData.localID, m_scene.RegionInfo.RegionID);

+                        //They are going below the safety line!

+                        if (!parcel.isBannedFromLand(clientAvatar.UUID))

+                        {

+                            clientAvatar.sentMessageAboutRestrictedParcelFlyingDown = false;

+                        }

+                    }

+                    else if (clientAvatar.AbsolutePosition.Z < BAN_LINE_SAFETY_HIEGHT &&

+                             parcel.isBannedFromLand(clientAvatar.UUID))

+                    {

+                        sendYouAreBannedNotice(clientAvatar);

+                    }

+                }

+            }

+        }

+

+        public void handleAnyClientMovement(ScenePresence avatar)

+        //Like handleSignificantClientMovement, but called with an AgentUpdate regardless of distance. 

+        {

+            ILandObject over = getLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);

+            if (over != null)

+            {

+                if (!over.isBannedFromLand(avatar.UUID) || avatar.AbsolutePosition.Z >= BAN_LINE_SAFETY_HIEGHT)

+                {

+                    avatar.lastKnownAllowedPosition =

+                        new Vector3(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z);

+                }

+            }

+        }

+

+

+        public void handleParcelAccessRequest(LLUUID agentID, LLUUID sessionID, uint flags, int sequenceID,

+                                              int landLocalID, IClientAPI remote_client)

+        {

+            if (landList.ContainsKey(landLocalID))

+            {

+                landList[landLocalID].sendAccessList(agentID, sessionID, flags, sequenceID, remote_client);

+            }

+        }

+

+        public void handleParcelAccessUpdateRequest(LLUUID agentID, LLUUID sessionID, uint flags, int landLocalID,

+                                                    List<ParcelManager.ParcelAccessEntry> entries,

+                                                    IClientAPI remote_client)

+        {

+            if (landList.ContainsKey(landLocalID))

+            {

+                if (agentID == landList[landLocalID].landData.ownerID)

+                {

+                    landList[landLocalID].updateAccessList(flags, entries, remote_client);

+                }

+            }

+            else

+            {

+                Console.WriteLine("INVALID LOCAL LAND ID");

+            }

+        }

+

+    }

+}

diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs
new file mode 100644
index 0000000..ac8c1a8
--- /dev/null
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs
@@ -0,0 +1,62 @@
+using System;

+using System.Collections.Generic;

+using libsecondlife;

+using libsecondlife.Packets;

+using OpenSim.Framework;

+using OpenSim.Framework.Console;

+using OpenSim.Region.Environment.Scenes;

+using OpenSim.Region.Environment.Interfaces;

+using Nini.Config;

+

+namespace OpenSim.Region.Environment.Modules.LandManagement

+{

+    public class LandManagementModule : IRegionModule

+    {

+        private LandChannel landChannel;

+        private Scene m_scene;

+

+        #region IRegionModule Members

+

+        public void Initialise(Scene scene, IConfigSource source)

+        {

+            m_scene = scene;

+            landChannel = new LandChannel(scene);

+                   

+            m_scene.EventManager.OnParcelPrimCountAdd += landChannel.addPrimToLandPrimCounts;

+            m_scene.EventManager.OnParcelPrimCountUpdate += landChannel.updateLandPrimCounts;

+            m_scene.EventManager.OnAvatarEnteringNewParcel += new EventManager.AvatarEnteringNewParcel(landChannel.handleAvatarChangingParcel);

+            m_scene.EventManager.OnClientMovement += new EventManager.ClientMovement(landChannel.handleAnyClientMovement);

+

+            lock (m_scene)

+            {

+                m_scene.LandChannel = (ILandChannel)landChannel;

+            }

+        }

+

+        public void PostInitialise()

+        {

+            

+        }

+

+        public void Close()

+        {

+            

+        }

+

+        public string Name

+        {

+            get { return "LandManagementModule"; }

+        }

+

+        public bool IsSharedModule

+        {

+            get { return false; }

+        }

+

+        

+

+        

+

+        #endregion

+    }

+}

diff --git a/OpenSim/Region/Environment/LandManagement/Land.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
index 5b84103..4e2fbd3 100644
--- a/OpenSim/Region/Environment/LandManagement/Land.cs
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
@@ -1,842 +1,879 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework;
-using OpenSim.Framework.Console;
-using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.Environment.Interfaces;
-
-namespace OpenSim.Region.Environment.LandManagement
-{
-
-    #region Parcel Class
-
-    /// <summary>
-    /// Keeps track of a specific piece of land's information
-    /// </summary>
-    public class Land
-    {
-        #region Member Variables
-
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-
-        public LandData landData = new LandData();
-        public List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>();
-        public Scene m_scene;
-
-        private bool[,] landBitmap = new bool[64,64];
-
-        #endregion
-
-        #region Constructors
-
-        public Land(LLUUID owner_id, bool is_group_owned, Scene scene)
-        {
-            m_scene = scene;
-            landData.ownerID = owner_id;
-            landData.isGroupOwned = is_group_owned;
-        }
-
-        #endregion
-
-        #region Member Functions
-
-        #region General Functions
-
-        /// <summary>
-        /// Checks to see if this land object contains a point
-        /// </summary>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <returns>Returns true if the piece of land contains the specified point</returns>
-        public bool containsPoint(int x, int y)
-        {
-            if (x >= 0 && y >= 0 && x <= Constants.RegionSize && x <= Constants.RegionSize)
-            {
-                return (landBitmap[x/4, y/4] == true);
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        public Land Copy()
-        {
-            Land newLand = new Land(landData.ownerID, landData.isGroupOwned, m_scene);
-
-            //Place all new variables here!
-            newLand.landBitmap = (bool[,]) (landBitmap.Clone());
-            newLand.landData = landData.Copy();
-
-            return newLand;
-        }
-
-        #endregion
-
-        #region Packet Request Handling
-
-        /// <summary>
-        /// Sends land properties as requested
-        /// </summary>
-        /// <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="remote_client">Object representing the client</param>
-        public void sendLandProperties(int sequence_id, bool snap_selection, int request_result,
-                                       IClientAPI remote_client)
-        {
-            ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket) PacketPool.Instance.GetPacket(PacketType.ParcelProperties);
-            // TODO: don't create new blocks if recycling an old packet
- 
-            updatePacket.ParcelData.AABBMax = landData.AABBMax;
-            updatePacket.ParcelData.AABBMin = landData.AABBMin;
-            updatePacket.ParcelData.Area = landData.area;
-            updatePacket.ParcelData.AuctionID = landData.auctionID;
-            updatePacket.ParcelData.AuthBuyerID = landData.authBuyerID; //unemplemented
-
-            updatePacket.ParcelData.Bitmap = landData.landBitmapByteArray;
-
-            updatePacket.ParcelData.Desc = Helpers.StringToField(landData.landDesc);
-            updatePacket.ParcelData.Category = (byte) landData.category;
-            updatePacket.ParcelData.ClaimDate = landData.claimDate;
-            updatePacket.ParcelData.ClaimPrice = landData.claimPrice;
-            updatePacket.ParcelData.GroupID = landData.groupID;
-            updatePacket.ParcelData.GroupPrims = landData.groupPrims;
-            updatePacket.ParcelData.IsGroupOwned = landData.isGroupOwned;
-            updatePacket.ParcelData.LandingType = (byte) landData.landingType;
-            updatePacket.ParcelData.LocalID = landData.localID;
-            if (landData.area > 0)
-            {
-                updatePacket.ParcelData.MaxPrims =
-                    Convert.ToInt32(
-                        Math.Round((Convert.ToDecimal(landData.area)/Convert.ToDecimal(65536))*15000*
-                                   Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor)));
-            }
-            else
-            {
-                updatePacket.ParcelData.MaxPrims = 0;
-            }
-            updatePacket.ParcelData.MediaAutoScale = landData.mediaAutoScale;
-            updatePacket.ParcelData.MediaID = landData.mediaID;
-            updatePacket.ParcelData.MediaURL = Helpers.StringToField(landData.mediaURL);
-            updatePacket.ParcelData.MusicURL = Helpers.StringToField(landData.musicURL);
-            updatePacket.ParcelData.Name = Helpers.StringToField(landData.landName);
-            updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented
-            updatePacket.ParcelData.OtherCount = 0; //unemplemented
-            updatePacket.ParcelData.OtherPrims = landData.otherPrims;
-            updatePacket.ParcelData.OwnerID = landData.ownerID;
-            updatePacket.ParcelData.OwnerPrims = landData.ownerPrims;
-            updatePacket.ParcelData.ParcelFlags = landData.landFlags;
-            updatePacket.ParcelData.ParcelPrimBonus = m_scene.RegionInfo.EstateSettings.objectBonusFactor;
-            updatePacket.ParcelData.PassHours = landData.passHours;
-            updatePacket.ParcelData.PassPrice = landData.passPrice;
-            updatePacket.ParcelData.PublicCount = 0; //unemplemented
-
-            uint regionFlags = (uint) m_scene.RegionInfo.EstateSettings.regionFlags;
-            updatePacket.ParcelData.RegionDenyAnonymous = ((regionFlags & (uint) Simulator.RegionFlags.DenyAnonymous) >
-                                                           0);
-            updatePacket.ParcelData.RegionDenyIdentified = ((regionFlags & (uint) Simulator.RegionFlags.DenyIdentified) >
-                                                            0);
-            updatePacket.ParcelData.RegionDenyTransacted = ((regionFlags & (uint) Simulator.RegionFlags.DenyTransacted) >
-                                                            0);
-            updatePacket.ParcelData.RegionPushOverride = ((regionFlags & (uint) Simulator.RegionFlags.RestrictPushObject) >
-                                                          0);
-
-            updatePacket.ParcelData.RentPrice = 0;
-            updatePacket.ParcelData.RequestResult = request_result;
-            updatePacket.ParcelData.SalePrice = landData.salePrice;
-            updatePacket.ParcelData.SelectedPrims = landData.selectedPrims;
-            updatePacket.ParcelData.SelfCount = 0; //unemplemented
-            updatePacket.ParcelData.SequenceID = sequence_id;
-            if (landData.simwideArea > 0)
-            {
-                updatePacket.ParcelData.SimWideMaxPrims =
-                    Convert.ToInt32(
-                        Math.Round((Convert.ToDecimal(landData.simwideArea)/Convert.ToDecimal(65536))*15000*
-                                   Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor)));
-            }
-            else
-            {
-                updatePacket.ParcelData.SimWideMaxPrims = 0;
-            }
-            updatePacket.ParcelData.SimWideTotalPrims = landData.simwidePrims;
-            updatePacket.ParcelData.SnapSelection = snap_selection;
-            updatePacket.ParcelData.SnapshotID = landData.snapshotID;
-            updatePacket.ParcelData.Status = (byte) landData.landStatus;
-            updatePacket.ParcelData.TotalPrims = landData.ownerPrims + landData.groupPrims + landData.otherPrims +
-                                                 landData.selectedPrims;
-            updatePacket.ParcelData.UserLocation = landData.userLocation;
-            updatePacket.ParcelData.UserLookAt = landData.userLookAt;
-            remote_client.OutPacket((Packet) updatePacket, ThrottleOutPacketType.Task);
-        }
-
-        public void updateLandProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
-        {
-            if (remote_client.AgentId == landData.ownerID)
-            {
-                //Needs later group support
-                LandData newData = landData.Copy();
-                newData.authBuyerID = packet.ParcelData.AuthBuyerID;
-                newData.category = (Parcel.ParcelCategory) packet.ParcelData.Category;
-                newData.landDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc);
-                newData.groupID = packet.ParcelData.GroupID;
-                newData.landingType = packet.ParcelData.LandingType;
-                newData.mediaAutoScale = packet.ParcelData.MediaAutoScale;
-                newData.mediaID = packet.ParcelData.MediaID;
-                newData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);
-                newData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);
-                newData.landName = Helpers.FieldToUTF8String(packet.ParcelData.Name);
-                newData.landFlags = packet.ParcelData.ParcelFlags;
-                newData.passHours = packet.ParcelData.PassHours;
-                newData.passPrice = packet.ParcelData.PassPrice;
-                newData.salePrice = packet.ParcelData.SalePrice;
-                newData.snapshotID = packet.ParcelData.SnapshotID;
-                newData.userLocation = packet.ParcelData.UserLocation;
-                newData.userLookAt = packet.ParcelData.UserLookAt;
-
-                m_scene.LandManager.updateLandObject(landData.localID, newData);
-
-                sendLandUpdateToAvatarsOverMe();
-            }
-        }
-
-        public bool isEitherBannedOrRestricted(LLUUID avatar)
-        {
-            if (isBannedFromLand(avatar))
-            {
-                return true;
-            }
-            else if (isRestrictedFromLand(avatar))
-            {
-                return true;
-            }
-            return false;
-        }
-
-        public bool isBannedFromLand(LLUUID avatar)
-        {
-            if ((landData.landFlags & (uint) Parcel.ParcelFlags.UseBanList) > 0)
-            {
-                ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
-                entry.AgentID = avatar;
-                entry.Flags = ParcelManager.AccessList.Ban;
-                entry.Time = new DateTime();
-                if (landData.parcelAccessList.Contains(entry))
-                {
-                    //They are banned, so lets send them a notice about this parcel
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public bool isRestrictedFromLand(LLUUID avatar)
-        {
-            if ((landData.landFlags & (uint) Parcel.ParcelFlags.UseAccessList) > 0)
-            {
-                ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
-                entry.AgentID = avatar;
-                entry.Flags = ParcelManager.AccessList.Access;
-                entry.Time = new DateTime();
-                if (!landData.parcelAccessList.Contains(entry))
-                {
-                    //They are not allowed in this parcel, but not banned, so lets send them a notice about this parcel
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public void sendLandUpdateToClient(IClientAPI remote_client)
-        {
-            sendLandProperties(0, false, 0, remote_client);
-        }
-
-        public void sendLandUpdateToAvatarsOverMe()
-        {
-            List<ScenePresence> avatars = m_scene.GetAvatars();
-            Land over = null;
-            for (int i = 0; i < avatars.Count; i++)
-            {
-                try
-                {
-                    over =
-                        m_scene.LandManager.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))));
-                }
-                catch (Exception)
-                {
-                    m_log.Warn("[LAND]: " + "unable to get land at x: " + Math.Round(avatars[i].AbsolutePosition.X) + " y: " + Math.Round(avatars[i].AbsolutePosition.Y));
-                }
-
-                if (over != null)
-                {
-                    if (over.landData.localID == landData.localID)
-                    {
-                        sendLandUpdateToClient(avatars[i].ControllingClient);
-                    }
-                }
-            }
-        }
-
-        #endregion
-
-        #region AccessList Functions
-
-        public ParcelAccessListReplyPacket.ListBlock[] createAccessListArrayByFlag(ParcelManager.AccessList flag)
-        {
-            List<ParcelAccessListReplyPacket.ListBlock> list = new List<ParcelAccessListReplyPacket.ListBlock>();
-            foreach (ParcelManager.ParcelAccessEntry entry in landData.parcelAccessList)
-            {
-                if (entry.Flags == flag)
-                {
-                    ParcelAccessListReplyPacket.ListBlock listBlock = new ParcelAccessListReplyPacket.ListBlock();
-
-                    listBlock.Flags = (uint) 0;
-                    listBlock.ID = entry.AgentID;
-                    listBlock.Time = 0;
-
-                    list.Add(listBlock);
-                }
-            }
-
-            if (list.Count == 0)
-            {
-                ParcelAccessListReplyPacket.ListBlock listBlock = new ParcelAccessListReplyPacket.ListBlock();
-
-                listBlock.Flags = (uint) 0;
-                listBlock.ID = LLUUID.Zero;
-                listBlock.Time = 0;
-
-                list.Add(listBlock);
-            }
-            return list.ToArray();
-        }
-
-        public void sendAccessList(LLUUID agentID, LLUUID sessionID, uint flags, int sequenceID,
-                                   IClientAPI remote_client)
-        {
-            ParcelAccessListReplyPacket replyPacket;
-
-            if (flags == (uint) ParcelManager.AccessList.Access || flags == (uint) ParcelManager.AccessList.Both)
-            {
-                replyPacket = (ParcelAccessListReplyPacket) PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply);
-                replyPacket.Data.AgentID = agentID;
-                replyPacket.Data.Flags = (uint) ParcelManager.AccessList.Access;
-                replyPacket.Data.LocalID = landData.localID;
-                replyPacket.Data.SequenceID = 0;
-
-                replyPacket.List = createAccessListArrayByFlag(ParcelManager.AccessList.Access);
-                remote_client.OutPacket((Packet) replyPacket, ThrottleOutPacketType.Task);
-            }
-
-            if (flags == (uint) ParcelManager.AccessList.Ban || flags == (uint) ParcelManager.AccessList.Both)
-            {
-                replyPacket = (ParcelAccessListReplyPacket) PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply);
-                replyPacket.Data.AgentID = agentID;
-                replyPacket.Data.Flags = (uint) ParcelManager.AccessList.Ban;
-                replyPacket.Data.LocalID = landData.localID;
-                replyPacket.Data.SequenceID = 0;
-
-                replyPacket.List = createAccessListArrayByFlag(ParcelManager.AccessList.Ban);
-                remote_client.OutPacket((Packet) replyPacket, ThrottleOutPacketType.Task);
-            }
-        }
-
-        public void updateAccessList(uint flags, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client)
-        {
-            LandData newData = landData.Copy();
-
-            if (entries.Count == 1 && entries[0].AgentID == LLUUID.Zero)
-            {
-                entries.Clear();
-            }
-
-            List<ParcelManager.ParcelAccessEntry> toRemove = new List<ParcelManager.ParcelAccessEntry>();
-            foreach (ParcelManager.ParcelAccessEntry entry in newData.parcelAccessList)
-            {
-                if (entry.Flags == (ParcelManager.AccessList) flags)
-                {
-                    toRemove.Add(entry);
-                }
-            }
-
-            foreach (ParcelManager.ParcelAccessEntry entry in toRemove)
-            {
-                newData.parcelAccessList.Remove(entry);
-            }
-            foreach (ParcelManager.ParcelAccessEntry entry in entries)
-            {
-                ParcelManager.ParcelAccessEntry temp = new ParcelManager.ParcelAccessEntry();
-                temp.AgentID = entry.AgentID;
-                temp.Time = new DateTime(); //Pointless? Yes.
-                temp.Flags = (ParcelManager.AccessList) flags;
-
-                if (!newData.parcelAccessList.Contains(temp))
-                {
-                    newData.parcelAccessList.Add(temp);
-                }
-            }
-
-            m_scene.LandManager.updateLandObject(landData.localID, newData);
-        }
-
-        #endregion
-
-        #region Update Functions
-
-        /// <summary>
-        /// Updates the AABBMin and AABBMax values after area/shape modification of the land object
-        /// </summary>
-        private void updateAABBAndAreaValues()
-        {
-            int min_x = 64;
-            int min_y = 64;
-            int max_x = 0;
-            int max_y = 0;
-            int tempArea = 0;
-            int x, y;
-            for (x = 0; x < 64; x++)
-            {
-                for (y = 0; y < 64; y++)
-                {
-                    if (landBitmap[x, y] == true)
-                    {
-                        if (min_x > x) min_x = x;
-                        if (min_y > y) min_y = y;
-                        if (max_x < x) max_x = x;
-                        if (max_y < y) max_y = y;
-                        tempArea += 16; //16sqm peice of land
-                    }
-                }
-            }
-            int tx = min_x * 4;
-            if (tx > 255)
-                tx = 255;
-            int ty = min_y * 4;
-            if (ty > 255)
-                ty = 255;
-            landData.AABBMin =
-                new LLVector3((float)(min_x * 4), (float)(min_y * 4),
-                              (float)m_scene.Heightmap[tx, ty]);
-
-            tx = max_x * 4;
-            if (tx > 255)
-                tx = 255;
-            ty = max_y * 4;
-            if (ty > 255)
-                ty = 255;
-            landData.AABBMax =
-                new LLVector3((float)(max_x * 4), (float)(max_y * 4),
-                              (float)m_scene.Heightmap[tx, ty]);
-            landData.area = tempArea;
-        }
-
-        public void updateLandBitmapByteArray()
-        {
-            landData.landBitmapByteArray = convertLandBitmapToBytes();
-        }
-
-        /// <summary>
-        /// Update all settings in land such as area, bitmap byte array, etc
-        /// </summary>
-        public void forceUpdateLandInfo()
-        {
-            updateAABBAndAreaValues();
-            updateLandBitmapByteArray();
-        }
-
-        public void setLandBitmapFromByteArray()
-        {
-            landBitmap = convertBytesToLandBitmap();
-        }
-
-        #endregion
-
-        #region Land Bitmap Functions
-
-        /// <summary>
-        /// Sets the land's bitmap manually
-        /// </summary>
-        /// <param name="bitmap">64x64 block representing where this land is on a map</param>
-        public void setLandBitmap(bool[,] bitmap)
-        {
-            if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2)
-            {
-                //Throw an exception - The bitmap is not 64x64
-                //throw new Exception("Error: Invalid Parcel Bitmap");
-            }
-            else
-            {
-                //Valid: Lets set it
-                landBitmap = bitmap;
-                forceUpdateLandInfo();
-            }
-        }
-
-        /// <summary>
-        /// Gets the land's bitmap manually
-        /// </summary>
-        /// <returns></returns>
-        public bool[,] getLandBitmap()
-        {
-            return landBitmap;
-        }
-
-        /// <summary>
-        /// Converts the land bitmap to a packet friendly byte array
-        /// </summary>
-        /// <returns></returns>
-        private byte[] convertLandBitmapToBytes()
-        {
-            byte[] tempConvertArr = new byte[512];
-            byte tempByte = 0;
-            int x, y, i, byteNum = 0;
-            i = 0;
-            for (y = 0; y < 64; y++)
-            {
-                for (x = 0; x < 64; x++)
-                {
-                    tempByte = Convert.ToByte(tempByte | Convert.ToByte(landBitmap[x, y]) << (i++%8));
-                    if (i%8 == 0)
-                    {
-                        tempConvertArr[byteNum] = tempByte;
-                        tempByte = (byte) 0;
-                        i = 0;
-                        byteNum++;
-                    }
-                }
-            }
-            return tempConvertArr;
-        }
-
-        private bool[,] convertBytesToLandBitmap()
-        {
-            bool[,] tempConvertMap = new bool[64,64];
-            tempConvertMap.Initialize();
-            byte tempByte = 0;
-            int x = 0, y = 0, i = 0, bitNum = 0;
-            for (i = 0; i < 512; i++)
-            {
-                tempByte = landData.landBitmapByteArray[i];
-                for (bitNum = 0; bitNum < 8; bitNum++)
-                {
-                    bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte) 1);
-                    tempConvertMap[x, y] = bit;
-                    x++;
-                    if (x > 63)
-                    {
-                        x = 0;
-                        y++;
-                    }
-                }
-            }
-            return tempConvertMap;
-        }
-
-        /// <summary>
-        /// Full sim land object creation
-        /// </summary>
-        /// <returns></returns>
-        public static bool[,] basicFullRegionLandBitmap()
-        {
-            return getSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize);
-        }
-
-        /// <summary>
-        /// Used to modify the bitmap between the x and y points. Points use 64 scale
-        /// </summary>
-        /// <param name="start_x"></param>
-        /// <param name="start_y"></param>
-        /// <param name="end_x"></param>
-        /// <param name="end_y"></param>
-        /// <returns></returns>
-        public static bool[,] getSquareLandBitmap(int start_x, int start_y, int end_x, int end_y)
-        {
-            bool[,] tempBitmap = new bool[64,64];
-            tempBitmap.Initialize();
-
-            tempBitmap = modifyLandBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);
-            return tempBitmap;
-        }
-
-        /// <summary>
-        /// Change a land bitmap at within a square and set those points to a specific value
-        /// </summary>
-        /// <param name="land_bitmap"></param>
-        /// <param name="start_x"></param>
-        /// <param name="start_y"></param>
-        /// <param name="end_x"></param>
-        /// <param name="end_y"></param>
-        /// <param name="set_value"></param>
-        /// <returns></returns>
-        public static bool[,] modifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y,
-                                                     bool set_value)
-        {
-            if (land_bitmap.GetLength(0) != 64 || land_bitmap.GetLength(1) != 64 || land_bitmap.Rank != 2)
-            {
-                //Throw an exception - The bitmap is not 64x64
-                //throw new Exception("Error: Invalid Parcel Bitmap in modifyLandBitmapSquare()");
-            }
-
-            int x, y;
-            for (y = 0; y < 64; y++)
-            {
-                for (x = 0; x < 64; x++)
-                {
-                    if (x >= start_x/4 && x < end_x/4
-                        && y >= start_y/4 && y < end_y/4)
-                    {
-                        land_bitmap[x, y] = set_value;
-                    }
-                }
-            }
-            return land_bitmap;
-        }
-
-        /// <summary>
-        /// Join the true values of 2 bitmaps together
-        /// </summary>
-        /// <param name="bitmap_base"></param>
-        /// <param name="bitmap_add"></param>
-        /// <returns></returns>
-        public static bool[,] mergeLandBitmaps(bool[,] bitmap_base, bool[,] bitmap_add)
-        {
-            if (bitmap_base.GetLength(0) != 64 || bitmap_base.GetLength(1) != 64 || bitmap_base.Rank != 2)
-            {
-                //Throw an exception - The bitmap is not 64x64
-                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)
-            {
-                //Throw an exception - The bitmap is not 64x64
-                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_add in mergeLandBitmaps");
-            }
-
-            int x, y;
-            for (y = 0; y < 64; y++)
-            {
-                for (x = 0; x < 64; x++)
-                {
-                    if (bitmap_add[x, y])
-                    {
-                        bitmap_base[x, y] = true;
-                    }
-                }
-            }
-            return bitmap_base;
-        }
-
-        #endregion
-
-        #region Object Select and Object Owner Listing
-
-        public void sendForceObjectSelect(int local_id, int request_type, IClientAPI remote_client)
-        {
-            List<uint> resultLocalIDs = new List<uint>();
-            foreach (SceneObjectGroup obj in primsOverMe)
-            {
-                if (obj.LocalId > 0)
-                {
-                    if (request_type == LandManager.LAND_SELECT_OBJECTS_OWNER && obj.OwnerID == landData.ownerID)
-                    {
-                        resultLocalIDs.Add(obj.LocalId);
-                    }
-                        // else if (request_type == LandManager.LAND_SELECT_OBJECTS_GROUP && ...) // TODO: group support
-                        // {
-                        // }
-                    else if (request_type == LandManager.LAND_SELECT_OBJECTS_OTHER &&
-                             obj.OwnerID != remote_client.AgentId)
-                    {
-                        resultLocalIDs.Add(obj.LocalId);
-                    }
-                }
-            }
-
-
-            bool firstCall = true;
-            int MAX_OBJECTS_PER_PACKET = 251;
-            ForceObjectSelectPacket pack = (ForceObjectSelectPacket) PacketPool.Instance.GetPacket(PacketType.ForceObjectSelect);
-            // TODO: don't create new blocks if recycling an old packet
-            ForceObjectSelectPacket.DataBlock[] data;
-            while (resultLocalIDs.Count > 0)
-            {
-                if (firstCall)
-                {
-                    pack._Header.ResetList = true;
-                    firstCall = false;
-                }
-                else
-                {
-                    pack._Header.ResetList = false;
-                }
-
-                if (resultLocalIDs.Count > MAX_OBJECTS_PER_PACKET)
-                {
-                    data = new ForceObjectSelectPacket.DataBlock[MAX_OBJECTS_PER_PACKET];
-                }
-                else
-                {
-                    data = new ForceObjectSelectPacket.DataBlock[resultLocalIDs.Count];
-                }
-
-                int i;
-                for (i = 0; i < MAX_OBJECTS_PER_PACKET && resultLocalIDs.Count > 0; i++)
-                {
-                    data[i] = new ForceObjectSelectPacket.DataBlock();
-                    data[i].LocalID = Convert.ToUInt32(resultLocalIDs[0]);
-                    resultLocalIDs.RemoveAt(0);
-                }
-                pack.Data = data;
-                remote_client.OutPacket((Packet) pack, ThrottleOutPacketType.Task);
-            }
-        }
-
-        public void sendLandObjectOwners(IClientAPI remote_client)
-        {
-            Dictionary<LLUUID, int> ownersAndCount = new Dictionary<LLUUID, int>();
-            ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket) PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply);
-            // TODO: don't create new blocks if recycling an old packet
-
-            foreach (SceneObjectGroup obj in primsOverMe)
-            {
-                if (!ownersAndCount.ContainsKey(obj.OwnerID))
-                {
-                    ownersAndCount.Add(obj.OwnerID, 0);
-                }
-                ownersAndCount[obj.OwnerID] += obj.PrimCount;
-            }
-            if (ownersAndCount.Count > 0)
-            {
-                ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock = new ParcelObjectOwnersReplyPacket.DataBlock[32];
-
-                if (ownersAndCount.Count < 32)
-                {
-                    dataBlock = new ParcelObjectOwnersReplyPacket.DataBlock[ownersAndCount.Count];
-                }
-
-
-                int num = 0;
-                foreach (LLUUID owner in ownersAndCount.Keys)
-                {
-                    dataBlock[num] = new ParcelObjectOwnersReplyPacket.DataBlock();
-                    dataBlock[num].Count = ownersAndCount[owner];
-                    dataBlock[num].IsGroupOwned = false; //TODO: fix me when group support is added
-                    dataBlock[num].OnlineStatus = true; //TODO: fix me later
-                    dataBlock[num].OwnerID = owner;
-
-                    num++;
-                }
-                pack.Data = dataBlock;
-            }
-            remote_client.OutPacket(pack, ThrottleOutPacketType.Task);
-        }
-
-        #endregion
-
-        #region Object Returning
-
-        public void returnObject(SceneObjectGroup obj)
-        {
-        }
-
-        public void returnLandObjects(int type, LLUUID owner)
-        {
-        }
-
-        #endregion
-
-        #region Object Adding/Removing from Parcel
-
-        public void resetLandPrimCounts()
-        {
-            landData.groupPrims = 0;
-            landData.ownerPrims = 0;
-            landData.otherPrims = 0;
-            landData.selectedPrims = 0;
-            primsOverMe.Clear();
-        }
-
-        public void addPrimToCount(SceneObjectGroup obj)
-        {
-            LLUUID prim_owner = obj.OwnerID;
-            int prim_count = obj.PrimCount;
-
-            if (obj.IsSelected)
-            {
-                landData.selectedPrims += prim_count;
-            }
-            else
-            {
-                if (prim_owner == landData.ownerID)
-                {
-                    landData.ownerPrims += prim_count;
-                }
-                else
-                {
-                    landData.otherPrims += prim_count;
-                }
-            }
-
-            primsOverMe.Add(obj);
-        }
-
-        public void removePrimFromCount(SceneObjectGroup obj)
-        {
-            if (primsOverMe.Contains(obj))
-            {
-                LLUUID prim_owner = obj.OwnerID;
-                int prim_count = obj.PrimCount;
-
-                if (prim_owner == landData.ownerID)
-                {
-                    landData.ownerPrims -= prim_count;
-                }
-                else if (prim_owner == landData.groupID)
-                {
-                    landData.groupPrims -= prim_count;
-                }
-                else
-                {
-                    landData.otherPrims -= prim_count;
-                }
-
-                primsOverMe.Remove(obj);
-            }
-        }
-
-        #endregion
-
-        #endregion
-    }
-
-    #endregion
-}
+/*

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ */

+

+using System;

+using System.Collections.Generic;

+using libsecondlife;

+using libsecondlife.Packets;

+using OpenSim.Framework;

+using OpenSim.Framework.Console;

+using OpenSim.Region.Environment.Scenes;

+using OpenSim.Region.Environment.Interfaces;

+

+namespace OpenSim.Region.Environment.Modules.LandManagement

+{

+

+    #region LandObject Class

+

+    /// <summary>

+    /// Keeps track of a specific piece of land's information

+    /// </summary>

+    public class LandObject : ILandObject

+    {

+        #region Member Variables

+

+        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);

+

+        protected LandData m_landData = new LandData();

+        protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>();

+        protected Scene m_scene;

+

+        private bool[,] m_landBitmap = new bool[64,64];

+

+        public bool[,] landBitmap

+        {

+            get

+            {

+                return m_landBitmap;

+            }

+            set

+            {

+                m_landBitmap = value;

+            }

+        }

+

+        #endregion

+

+        #region ILandObject Members

+

+        public LandData landData

+        {

+                get 

+                { 

+                        return m_landData;

+                }

+

+                set 

+                { 

+                        m_landData = value; 

+                }

+        }

+

+        public LLUUID  regionUUID

+        {

+                get { return m_scene.RegionInfo.RegionID; }

+        }

+

+        #endregion

+        

+

+        #region Constructors

+

+        public LandObject(LLUUID owner_id, bool is_group_owned, Scene scene)

+        {

+            m_scene = scene;

+            landData.ownerID = owner_id;

+            landData.isGroupOwned = is_group_owned;

+        }

+

+        #endregion

+

+        #region Member Functions

+

+        #region General Functions

+

+        /// <summary>

+        /// Checks to see if this land object contains a point

+        /// </summary>

+        /// <param name="x"></param>

+        /// <param name="y"></param>

+        /// <returns>Returns true if the piece of land contains the specified point</returns>

+        public bool containsPoint(int x, int y)

+        {

+            if (x >= 0 && y >= 0 && x <= Constants.RegionSize && x <= Constants.RegionSize)

+            {

+                return (landBitmap[x/4, y/4] == true);

+            }

+            else

+            {

+                return false;

+            }

+        }

+

+        public ILandObject Copy()

+        {

+            ILandObject newLand = new LandObject(landData.ownerID, landData.isGroupOwned, m_scene);

+

+            //Place all new variables here!

+            newLand.landBitmap = (bool[,]) (landBitmap.Clone());

+            newLand.landData = landData.Copy();

+

+            return newLand;

+        }

+

+        #endregion

+

+        #region Packet Request Handling

+

+        /// <summary>

+        /// Sends land properties as requested

+        /// </summary>

+        /// <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="remote_client">Object representing the client</param>

+        public void sendLandProperties(int sequence_id, bool snap_selection, int request_result,

+                                       IClientAPI remote_client)

+        {

+            ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket) PacketPool.Instance.GetPacket(PacketType.ParcelProperties);

+            // TODO: don't create new blocks if recycling an old packet

+ 

+            updatePacket.ParcelData.AABBMax = landData.AABBMax;

+            updatePacket.ParcelData.AABBMin = landData.AABBMin;

+            updatePacket.ParcelData.Area = landData.area;

+            updatePacket.ParcelData.AuctionID = landData.auctionID;

+            updatePacket.ParcelData.AuthBuyerID = landData.authBuyerID; //unemplemented

+

+            updatePacket.ParcelData.Bitmap = landData.landBitmapByteArray;

+

+            updatePacket.ParcelData.Desc = Helpers.StringToField(landData.landDesc);

+            updatePacket.ParcelData.Category = (byte) landData.category;

+            updatePacket.ParcelData.ClaimDate = landData.claimDate;

+            updatePacket.ParcelData.ClaimPrice = landData.claimPrice;

+            updatePacket.ParcelData.GroupID = landData.groupID;

+            updatePacket.ParcelData.GroupPrims = landData.groupPrims;

+            updatePacket.ParcelData.IsGroupOwned = landData.isGroupOwned;

+            updatePacket.ParcelData.LandingType = (byte) landData.landingType;

+            updatePacket.ParcelData.LocalID = landData.localID;

+            if (landData.area > 0)

+            {

+                updatePacket.ParcelData.MaxPrims =

+                    Convert.ToInt32(

+                        Math.Round((Convert.ToDecimal(landData.area)/Convert.ToDecimal(65536))*15000*

+                                   Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor)));

+            }

+            else

+            {

+                updatePacket.ParcelData.MaxPrims = 0;

+            }

+            updatePacket.ParcelData.MediaAutoScale = landData.mediaAutoScale;

+            updatePacket.ParcelData.MediaID = landData.mediaID;

+            updatePacket.ParcelData.MediaURL = Helpers.StringToField(landData.mediaURL);

+            updatePacket.ParcelData.MusicURL = Helpers.StringToField(landData.musicURL);

+            updatePacket.ParcelData.Name = Helpers.StringToField(landData.landName);

+            updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented

+            updatePacket.ParcelData.OtherCount = 0; //unemplemented

+            updatePacket.ParcelData.OtherPrims = landData.otherPrims;

+            updatePacket.ParcelData.OwnerID = landData.ownerID;

+            updatePacket.ParcelData.OwnerPrims = landData.ownerPrims;

+            updatePacket.ParcelData.ParcelFlags = landData.landFlags;

+            updatePacket.ParcelData.ParcelPrimBonus = m_scene.RegionInfo.EstateSettings.objectBonusFactor;

+            updatePacket.ParcelData.PassHours = landData.passHours;

+            updatePacket.ParcelData.PassPrice = landData.passPrice;

+            updatePacket.ParcelData.PublicCount = 0; //unemplemented

+

+            uint regionFlags = (uint) m_scene.RegionInfo.EstateSettings.regionFlags;

+            updatePacket.ParcelData.RegionDenyAnonymous = ((regionFlags & (uint) Simulator.RegionFlags.DenyAnonymous) >

+                                                           0);

+            updatePacket.ParcelData.RegionDenyIdentified = ((regionFlags & (uint) Simulator.RegionFlags.DenyIdentified) >

+                                                            0);

+            updatePacket.ParcelData.RegionDenyTransacted = ((regionFlags & (uint) Simulator.RegionFlags.DenyTransacted) >

+                                                            0);

+            updatePacket.ParcelData.RegionPushOverride = ((regionFlags & (uint) Simulator.RegionFlags.RestrictPushObject) >

+                                                          0);

+

+            updatePacket.ParcelData.RentPrice = 0;

+            updatePacket.ParcelData.RequestResult = request_result;

+            updatePacket.ParcelData.SalePrice = landData.salePrice;

+            updatePacket.ParcelData.SelectedPrims = landData.selectedPrims;

+            updatePacket.ParcelData.SelfCount = 0; //unemplemented

+            updatePacket.ParcelData.SequenceID = sequence_id;

+            if (landData.simwideArea > 0)

+            {

+                updatePacket.ParcelData.SimWideMaxPrims =

+                    Convert.ToInt32(

+                        Math.Round((Convert.ToDecimal(landData.simwideArea)/Convert.ToDecimal(65536))*15000*

+                                   Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor)));

+            }

+            else

+            {

+                updatePacket.ParcelData.SimWideMaxPrims = 0;

+            }

+            updatePacket.ParcelData.SimWideTotalPrims = landData.simwidePrims;

+            updatePacket.ParcelData.SnapSelection = snap_selection;

+            updatePacket.ParcelData.SnapshotID = landData.snapshotID;

+            updatePacket.ParcelData.Status = (byte) landData.landStatus;

+            updatePacket.ParcelData.TotalPrims = landData.ownerPrims + landData.groupPrims + landData.otherPrims +

+                                                 landData.selectedPrims;

+            updatePacket.ParcelData.UserLocation = landData.userLocation;

+            updatePacket.ParcelData.UserLookAt = landData.userLookAt;

+            remote_client.OutPacket((Packet) updatePacket, ThrottleOutPacketType.Task);

+        }

+

+        public void updateLandProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)

+        {

+            if (remote_client.AgentId == landData.ownerID)

+            {

+                //Needs later group support

+                LandData newData = landData.Copy();

+                newData.authBuyerID = packet.ParcelData.AuthBuyerID;

+                newData.category = (Parcel.ParcelCategory) packet.ParcelData.Category;

+                newData.landDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc);

+                newData.groupID = packet.ParcelData.GroupID;

+                newData.landingType = packet.ParcelData.LandingType;

+                newData.mediaAutoScale = packet.ParcelData.MediaAutoScale;

+                newData.mediaID = packet.ParcelData.MediaID;

+                newData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);

+                newData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);

+                newData.landName = Helpers.FieldToUTF8String(packet.ParcelData.Name);

+                newData.landFlags = packet.ParcelData.ParcelFlags;

+                newData.passHours = packet.ParcelData.PassHours;

+                newData.passPrice = packet.ParcelData.PassPrice;

+                newData.salePrice = packet.ParcelData.SalePrice;

+                newData.snapshotID = packet.ParcelData.SnapshotID;

+                newData.userLocation = packet.ParcelData.UserLocation;

+                newData.userLookAt = packet.ParcelData.UserLookAt;

+

+                m_scene.LandChannel.updateLandObject(landData.localID, newData);

+

+                sendLandUpdateToAvatarsOverMe();

+            }

+        }

+

+        public bool isEitherBannedOrRestricted(LLUUID avatar)

+        {

+            if (isBannedFromLand(avatar))

+            {

+                return true;

+            }

+            else if (isRestrictedFromLand(avatar))

+            {

+                return true;

+            }

+            return false;

+        }

+

+        public bool isBannedFromLand(LLUUID avatar)

+        {

+            if ((landData.landFlags & (uint) Parcel.ParcelFlags.UseBanList) > 0)

+            {

+                ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();

+                entry.AgentID = avatar;

+                entry.Flags = ParcelManager.AccessList.Ban;

+                entry.Time = new DateTime();

+                if (landData.parcelAccessList.Contains(entry))

+                {

+                    //They are banned, so lets send them a notice about this parcel

+                    return true;

+                }

+            }

+            return false;

+        }

+

+        public bool isRestrictedFromLand(LLUUID avatar)

+        {

+            if ((landData.landFlags & (uint) Parcel.ParcelFlags.UseAccessList) > 0)

+            {

+                ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();

+                entry.AgentID = avatar;

+                entry.Flags = ParcelManager.AccessList.Access;

+                entry.Time = new DateTime();

+                if (!landData.parcelAccessList.Contains(entry))

+                {

+                    //They are not allowed in this parcel, but not banned, so lets send them a notice about this parcel

+                    return true;

+                }

+            }

+            return false;

+        }

+

+        public void sendLandUpdateToClient(IClientAPI remote_client)

+        {

+            sendLandProperties(0, false, 0, remote_client);

+        }

+

+        public void sendLandUpdateToAvatarsOverMe()

+        {

+            List<ScenePresence> avatars = m_scene.GetAvatars();

+            ILandObject over = null;

+            for (int i = 0; i < avatars.Count; i++)

+            {

+                try

+                {

+                    over =

+                        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))));

+                }

+                catch (Exception)

+                {

+                    m_log.Warn("[LAND]: " + "unable to get land at x: " + Math.Round(avatars[i].AbsolutePosition.X) + " y: " + Math.Round(avatars[i].AbsolutePosition.Y));

+                }

+

+                if (over != null)

+                {

+                    if (over.landData.localID == landData.localID)

+                    {

+                        sendLandUpdateToClient(avatars[i].ControllingClient);

+                    }

+                }

+            }

+        }

+

+        #endregion

+

+        #region AccessList Functions

+

+        public ParcelAccessListReplyPacket.ListBlock[] createAccessListArrayByFlag(ParcelManager.AccessList flag)

+        {

+            List<ParcelAccessListReplyPacket.ListBlock> list = new List<ParcelAccessListReplyPacket.ListBlock>();

+            foreach (ParcelManager.ParcelAccessEntry entry in landData.parcelAccessList)

+            {

+                if (entry.Flags == flag)

+                {

+                    ParcelAccessListReplyPacket.ListBlock listBlock = new ParcelAccessListReplyPacket.ListBlock();

+

+                    listBlock.Flags = (uint) 0;

+                    listBlock.ID = entry.AgentID;

+                    listBlock.Time = 0;

+

+                    list.Add(listBlock);

+                }

+            }

+

+            if (list.Count == 0)

+            {

+                ParcelAccessListReplyPacket.ListBlock listBlock = new ParcelAccessListReplyPacket.ListBlock();

+

+                listBlock.Flags = (uint) 0;

+                listBlock.ID = LLUUID.Zero;

+                listBlock.Time = 0;

+

+                list.Add(listBlock);

+            }

+            return list.ToArray();

+        }

+

+        public void sendAccessList(LLUUID agentID, LLUUID sessionID, uint flags, int sequenceID,

+                                   IClientAPI remote_client)

+        {

+            ParcelAccessListReplyPacket replyPacket;

+

+            if (flags == (uint) ParcelManager.AccessList.Access || flags == (uint) ParcelManager.AccessList.Both)

+            {

+                replyPacket = (ParcelAccessListReplyPacket) PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply);

+                replyPacket.Data.AgentID = agentID;

+                replyPacket.Data.Flags = (uint) ParcelManager.AccessList.Access;

+                replyPacket.Data.LocalID = landData.localID;

+                replyPacket.Data.SequenceID = 0;

+

+                replyPacket.List = createAccessListArrayByFlag(ParcelManager.AccessList.Access);

+                remote_client.OutPacket((Packet) replyPacket, ThrottleOutPacketType.Task);

+            }

+

+            if (flags == (uint) ParcelManager.AccessList.Ban || flags == (uint) ParcelManager.AccessList.Both)

+            {

+                replyPacket = (ParcelAccessListReplyPacket) PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply);

+                replyPacket.Data.AgentID = agentID;

+                replyPacket.Data.Flags = (uint) ParcelManager.AccessList.Ban;

+                replyPacket.Data.LocalID = landData.localID;

+                replyPacket.Data.SequenceID = 0;

+

+                replyPacket.List = createAccessListArrayByFlag(ParcelManager.AccessList.Ban);

+                remote_client.OutPacket((Packet) replyPacket, ThrottleOutPacketType.Task);

+            }

+        }

+

+        public void updateAccessList(uint flags, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client)

+        {

+            LandData newData = landData.Copy();

+

+            if (entries.Count == 1 && entries[0].AgentID == LLUUID.Zero)

+            {

+                entries.Clear();

+            }

+

+            List<ParcelManager.ParcelAccessEntry> toRemove = new List<ParcelManager.ParcelAccessEntry>();

+            foreach (ParcelManager.ParcelAccessEntry entry in newData.parcelAccessList)

+            {

+                if (entry.Flags == (ParcelManager.AccessList) flags)

+                {

+                    toRemove.Add(entry);

+                }

+            }

+

+            foreach (ParcelManager.ParcelAccessEntry entry in toRemove)

+            {

+                newData.parcelAccessList.Remove(entry);

+            }

+            foreach (ParcelManager.ParcelAccessEntry entry in entries)

+            {

+                ParcelManager.ParcelAccessEntry temp = new ParcelManager.ParcelAccessEntry();

+                temp.AgentID = entry.AgentID;

+                temp.Time = new DateTime(); //Pointless? Yes.

+                temp.Flags = (ParcelManager.AccessList) flags;

+

+                if (!newData.parcelAccessList.Contains(temp))

+                {

+                    newData.parcelAccessList.Add(temp);

+                }

+            }

+

+            m_scene.LandChannel.updateLandObject(landData.localID, newData);

+        }

+

+        #endregion

+

+        #region Update Functions

+

+        /// <summary>

+        /// Updates the AABBMin and AABBMax values after area/shape modification of the land object

+        /// </summary>

+        private void updateAABBAndAreaValues()

+        {

+            int min_x = 64;

+            int min_y = 64;

+            int max_x = 0;

+            int max_y = 0;

+            int tempArea = 0;

+            int x, y;

+            for (x = 0; x < 64; x++)

+            {

+                for (y = 0; y < 64; y++)

+                {

+                    if (landBitmap[x, y] == true)

+                    {

+                        if (min_x > x) min_x = x;

+                        if (min_y > y) min_y = y;

+                        if (max_x < x) max_x = x;

+                        if (max_y < y) max_y = y;

+                        tempArea += 16; //16sqm peice of land

+                    }

+                }

+            }

+            int tx = min_x * 4;

+            if (tx > 255)

+                tx = 255;

+            int ty = min_y * 4;

+            if (ty > 255)

+                ty = 255;

+            landData.AABBMin =

+                new LLVector3((float)(min_x * 4), (float)(min_y * 4),

+                              (float)m_scene.Heightmap[tx, ty]);

+

+            tx = max_x * 4;

+            if (tx > 255)

+                tx = 255;

+            ty = max_y * 4;

+            if (ty > 255)

+                ty = 255;

+            landData.AABBMax =

+                new LLVector3((float)(max_x * 4), (float)(max_y * 4),

+                              (float)m_scene.Heightmap[tx, ty]);

+            landData.area = tempArea;

+        }

+

+        public void updateLandBitmapByteArray()

+        {

+            landData.landBitmapByteArray = convertLandBitmapToBytes();

+        }

+

+        /// <summary>

+        /// Update all settings in land such as area, bitmap byte array, etc

+        /// </summary>

+        public void forceUpdateLandInfo()

+        {

+            updateAABBAndAreaValues();

+            updateLandBitmapByteArray();

+        }

+

+        public void setLandBitmapFromByteArray()

+        {

+            landBitmap = convertBytesToLandBitmap();

+        }

+

+        #endregion

+

+        #region Land Bitmap Functions

+

+        /// <summary>

+        /// Sets the land's bitmap manually

+        /// </summary>

+        /// <param name="bitmap">64x64 block representing where this land is on a map</param>

+        public void setLandBitmap(bool[,] bitmap)

+        {

+            if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2)

+            {

+                //Throw an exception - The bitmap is not 64x64

+                //throw new Exception("Error: Invalid Parcel Bitmap");

+            }

+            else

+            {

+                //Valid: Lets set it

+                landBitmap = bitmap;

+                forceUpdateLandInfo();

+            }

+        }

+

+        /// <summary>

+        /// Gets the land's bitmap manually

+        /// </summary>

+        /// <returns></returns>

+        public bool[,] getLandBitmap()

+        {

+            return landBitmap;

+        }

+

+        /// <summary>

+        /// Converts the land bitmap to a packet friendly byte array

+        /// </summary>

+        /// <returns></returns>

+        private byte[] convertLandBitmapToBytes()

+        {

+            byte[] tempConvertArr = new byte[512];

+            byte tempByte = 0;

+            int x, y, i, byteNum = 0;

+            i = 0;

+            for (y = 0; y < 64; y++)

+            {

+                for (x = 0; x < 64; x++)

+                {

+                    tempByte = Convert.ToByte(tempByte | Convert.ToByte(landBitmap[x, y]) << (i++%8));

+                    if (i%8 == 0)

+                    {

+                        tempConvertArr[byteNum] = tempByte;

+                        tempByte = (byte) 0;

+                        i = 0;

+                        byteNum++;

+                    }

+                }

+            }

+            return tempConvertArr;

+        }

+

+        private bool[,] convertBytesToLandBitmap()

+        {

+            bool[,] tempConvertMap = new bool[64,64];

+            tempConvertMap.Initialize();

+            byte tempByte = 0;

+            int x = 0, y = 0, i = 0, bitNum = 0;

+            for (i = 0; i < 512; i++)

+            {

+                tempByte = landData.landBitmapByteArray[i];

+                for (bitNum = 0; bitNum < 8; bitNum++)

+                {

+                    bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte) 1);

+                    tempConvertMap[x, y] = bit;

+                    x++;

+                    if (x > 63)

+                    {

+                        x = 0;

+                        y++;

+                    }

+                }

+            }

+            return tempConvertMap;

+        }

+

+        /// <summary>

+        /// Full sim land object creation

+        /// </summary>

+        /// <returns></returns>

+        public bool[,] basicFullRegionLandBitmap()

+        {

+            return getSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize);

+        }

+

+        /// <summary>

+        /// Used to modify the bitmap between the x and y points. Points use 64 scale

+        /// </summary>

+        /// <param name="start_x"></param>

+        /// <param name="start_y"></param>

+        /// <param name="end_x"></param>

+        /// <param name="end_y"></param>

+        /// <returns></returns>

+        public bool[,] getSquareLandBitmap(int start_x, int start_y, int end_x, int end_y)

+        {

+            bool[,] tempBitmap = new bool[64,64];

+            tempBitmap.Initialize();

+

+            tempBitmap = modifyLandBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);

+            return tempBitmap;

+        }

+

+        /// <summary>

+        /// Change a land bitmap at within a square and set those points to a specific value

+        /// </summary>

+        /// <param name="land_bitmap"></param>

+        /// <param name="start_x"></param>

+        /// <param name="start_y"></param>

+        /// <param name="end_x"></param>

+        /// <param name="end_y"></param>

+        /// <param name="set_value"></param>

+        /// <returns></returns>

+        public bool[,] modifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y,

+                                                     bool set_value)

+        {

+            if (land_bitmap.GetLength(0) != 64 || land_bitmap.GetLength(1) != 64 || land_bitmap.Rank != 2)

+            {

+                //Throw an exception - The bitmap is not 64x64

+                //throw new Exception("Error: Invalid Parcel Bitmap in modifyLandBitmapSquare()");

+            }

+

+            int x, y;

+            for (y = 0; y < 64; y++)

+            {

+                for (x = 0; x < 64; x++)

+                {

+                    if (x >= start_x/4 && x < end_x/4

+                        && y >= start_y/4 && y < end_y/4)

+                    {

+                        land_bitmap[x, y] = set_value;

+                    }

+                }

+            }

+            return land_bitmap;

+        }

+

+        /// <summary>

+        /// Join the true values of 2 bitmaps together

+        /// </summary>

+        /// <param name="bitmap_base"></param>

+        /// <param name="bitmap_add"></param>

+        /// <returns></returns>

+        public bool[,] mergeLandBitmaps(bool[,] bitmap_base, bool[,] bitmap_add)

+        {

+            if (bitmap_base.GetLength(0) != 64 || bitmap_base.GetLength(1) != 64 || bitmap_base.Rank != 2)

+            {

+                //Throw an exception - The bitmap is not 64x64

+                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)

+            {

+                //Throw an exception - The bitmap is not 64x64

+                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_add in mergeLandBitmaps");

+            }

+

+            int x, y;

+            for (y = 0; y < 64; y++)

+            {

+                for (x = 0; x < 64; x++)

+                {

+                    if (bitmap_add[x, y])

+                    {

+                        bitmap_base[x, y] = true;

+                    }

+                }

+            }

+            return bitmap_base;

+        }

+

+        #endregion

+

+        #region Object Select and Object Owner Listing

+

+        public void sendForceObjectSelect(int local_id, int request_type, IClientAPI remote_client)

+        {

+            List<uint> resultLocalIDs = new List<uint>();

+            foreach (SceneObjectGroup obj in primsOverMe)

+            {

+                if (obj.LocalId > 0)

+                {

+                    if (request_type == LandChannel.LAND_SELECT_OBJECTS_OWNER && obj.OwnerID == landData.ownerID)

+                    {

+                        resultLocalIDs.Add(obj.LocalId);

+                    }

+                        // else if (request_type == LandManager.LAND_SELECT_OBJECTS_GROUP && ...) // TODO: group support

+                        // {

+                        // }

+                    else if (request_type == LandChannel.LAND_SELECT_OBJECTS_OTHER &&

+                             obj.OwnerID != remote_client.AgentId)

+                    {

+                        resultLocalIDs.Add(obj.LocalId);

+                    }

+                }

+            }

+

+

+            bool firstCall = true;

+            int MAX_OBJECTS_PER_PACKET = 251;

+            ForceObjectSelectPacket pack = (ForceObjectSelectPacket) PacketPool.Instance.GetPacket(PacketType.ForceObjectSelect);

+            // TODO: don't create new blocks if recycling an old packet

+            ForceObjectSelectPacket.DataBlock[] data;

+            while (resultLocalIDs.Count > 0)

+            {

+                if (firstCall)

+                {

+                    pack._Header.ResetList = true;

+                    firstCall = false;

+                }

+                else

+                {

+                    pack._Header.ResetList = false;

+                }

+

+                if (resultLocalIDs.Count > MAX_OBJECTS_PER_PACKET)

+                {

+                    data = new ForceObjectSelectPacket.DataBlock[MAX_OBJECTS_PER_PACKET];

+                }

+                else

+                {

+                    data = new ForceObjectSelectPacket.DataBlock[resultLocalIDs.Count];

+                }

+

+                int i;

+                for (i = 0; i < MAX_OBJECTS_PER_PACKET && resultLocalIDs.Count > 0; i++)

+                {

+                    data[i] = new ForceObjectSelectPacket.DataBlock();

+                    data[i].LocalID = Convert.ToUInt32(resultLocalIDs[0]);

+                    resultLocalIDs.RemoveAt(0);

+                }

+                pack.Data = data;

+                remote_client.OutPacket((Packet) pack, ThrottleOutPacketType.Task);

+            }

+        }

+

+        public void sendLandObjectOwners(IClientAPI remote_client)

+        {

+            Dictionary<LLUUID, int> ownersAndCount = new Dictionary<LLUUID, int>();

+            ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket) PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply);

+            // TODO: don't create new blocks if recycling an old packet

+

+            foreach (SceneObjectGroup obj in primsOverMe)

+            {

+                if (!ownersAndCount.ContainsKey(obj.OwnerID))

+                {

+                    ownersAndCount.Add(obj.OwnerID, 0);

+                }

+                ownersAndCount[obj.OwnerID] += obj.PrimCount;

+            }

+            if (ownersAndCount.Count > 0)

+            {

+                ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock = new ParcelObjectOwnersReplyPacket.DataBlock[32];

+

+                if (ownersAndCount.Count < 32)

+                {

+                    dataBlock = new ParcelObjectOwnersReplyPacket.DataBlock[ownersAndCount.Count];

+                }

+

+

+                int num = 0;

+                foreach (LLUUID owner in ownersAndCount.Keys)

+                {

+                    dataBlock[num] = new ParcelObjectOwnersReplyPacket.DataBlock();

+                    dataBlock[num].Count = ownersAndCount[owner];

+                    dataBlock[num].IsGroupOwned = false; //TODO: fix me when group support is added

+                    dataBlock[num].OnlineStatus = true; //TODO: fix me later

+                    dataBlock[num].OwnerID = owner;

+

+                    num++;

+                }

+                pack.Data = dataBlock;

+            }

+            remote_client.OutPacket(pack, ThrottleOutPacketType.Task);

+        }

+

+        #endregion

+

+        #region Object Returning

+

+        public void returnObject(SceneObjectGroup obj)

+        {

+        }

+

+        public void returnLandObjects(int type, LLUUID owner)

+        {

+        }

+

+        #endregion

+

+        #region Object Adding/Removing from Parcel

+

+        public void resetLandPrimCounts()

+        {

+            landData.groupPrims = 0;

+            landData.ownerPrims = 0;

+            landData.otherPrims = 0;

+            landData.selectedPrims = 0;

+            primsOverMe.Clear();

+        }

+

+        public void addPrimToCount(SceneObjectGroup obj)

+        {

+            LLUUID prim_owner = obj.OwnerID;

+            int prim_count = obj.PrimCount;

+

+            if (obj.IsSelected)

+            {

+                landData.selectedPrims += prim_count;

+            }

+            else

+            {

+                if (prim_owner == landData.ownerID)

+                {

+                    landData.ownerPrims += prim_count;

+                }

+                else

+                {

+                    landData.otherPrims += prim_count;

+                }

+            }

+

+            primsOverMe.Add(obj);

+        }

+

+        public void removePrimFromCount(SceneObjectGroup obj)

+        {

+            if (primsOverMe.Contains(obj))

+            {

+                LLUUID prim_owner = obj.OwnerID;

+                int prim_count = obj.PrimCount;

+

+                if (prim_owner == landData.ownerID)

+                {

+                    landData.ownerPrims -= prim_count;

+                }

+                else if (prim_owner == landData.groupID)

+                {

+                    landData.groupPrims -= prim_count;

+                }

+                else

+                {

+                    landData.otherPrims -= prim_count;

+                }

+

+                primsOverMe.Remove(obj);

+            }

+        }

+

+        #endregion

+

+        #endregion

+    

+

+}

+

+    #endregion

+}

diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs
index 27ec9d1..29987d8 100644
--- a/OpenSim/Region/Environment/PermissionManager.cs
+++ b/OpenSim/Region/Environment/PermissionManager.cs
@@ -26,9 +26,8 @@
  */
 
 using libsecondlife;
-using OpenSim.Region.Environment.LandManagement;
 using OpenSim.Region.Environment.Scenes;
-
+using OpenSim.Region.Environment.Interfaces;
 namespace OpenSim.Region.Environment
 {
     public class PermissionManager
@@ -126,7 +125,7 @@ namespace OpenSim.Region.Environment
 
             string reason = "Insufficient permission";
 
-            Land land = m_scene.LandManager.getLandObject(position.X, position.Y);
+            ILandObject land = m_scene.LandChannel.getLandObject(position.X, position.Y);
             if (land == null) return false;
 
             if ((land.landData.landFlags & ((int)Parcel.ParcelFlags.CreateObjects)) ==
@@ -230,7 +229,7 @@ namespace OpenSim.Region.Environment
             }
 
             // Users should be able to edit what is over their land.
-            Land parcel = m_scene.LandManager.getLandObject(task.AbsolutePosition.X, task.AbsolutePosition.Y);
+            ILandObject parcel = m_scene.LandChannel.getLandObject(task.AbsolutePosition.X, task.AbsolutePosition.Y);
             if (parcel != null && parcel.landData.ownerID == user)
                 return objectOwnerMask;
 
@@ -324,7 +323,7 @@ namespace OpenSim.Region.Environment
             }
 
             // Users should be able to edit what is over their land.
-            Land parcel = m_scene.LandManager.getLandObject(group.AbsolutePosition.X, group.AbsolutePosition.Y);
+            ILandObject parcel = m_scene.LandChannel.getLandObject(group.AbsolutePosition.X, group.AbsolutePosition.Y);
             if ((parcel != null) && (parcel.landData.ownerID == currentUser))
             {
                 permission = true;
@@ -551,7 +550,7 @@ namespace OpenSim.Region.Environment
                 Y = 0;
 
             // Land owner can terraform too
-            Land parcel = m_scene.LandManager.getLandObject(X, Y);
+            ILandObject parcel = m_scene.LandChannel.getLandObject(X, Y);
             if (parcel != null && GenericParcelPermission(user, parcel))
                 permission = true;
 
@@ -596,7 +595,7 @@ namespace OpenSim.Region.Environment
 
         #region Parcel Permissions
 
-        protected virtual bool GenericParcelPermission(LLUUID user, Land parcel)
+        protected virtual bool GenericParcelPermission(LLUUID user, ILandObject parcel)
         {
             bool permission = false;
 
@@ -625,22 +624,22 @@ namespace OpenSim.Region.Environment
 
         protected virtual bool GenericParcelPermission(LLUUID user, LLVector3 pos)
         {
-            Land parcel = m_scene.LandManager.getLandObject(pos.X, pos.Y);
+            ILandObject parcel = m_scene.LandChannel.getLandObject(pos.X, pos.Y);
             if (parcel == null) return false;
             return GenericParcelPermission(user, parcel);
         }
 
-        public virtual bool CanEditParcel(LLUUID user, Land parcel)
+        public virtual bool CanEditParcel(LLUUID user, ILandObject parcel)
         {
             return GenericParcelPermission(user, parcel);
         }
 
-        public virtual bool CanSellParcel(LLUUID user, Land parcel)
+        public virtual bool CanSellParcel(LLUUID user, ILandObject parcel)
         {
             return GenericParcelPermission(user, parcel);
         }
 
-        public virtual bool CanAbandonParcel(LLUUID user, Land parcel)
+        public virtual bool CanAbandonParcel(LLUUID user, ILandObject parcel)
         {
             return GenericParcelPermission(user, parcel);
         }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index e4ba7ef..869c936 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Region.Environment.Scenes
                         {
                             ((SceneObjectGroup) ent).GetProperties(remoteClient);
                             ((SceneObjectGroup) ent).IsSelected = true;
-                            LandManager.setPrimsTainted();
+                            LandChannel.setPrimsTainted();
                         }
                         break;
                     }
@@ -115,7 +115,7 @@ namespace OpenSim.Region.Environment.Scenes
                         if (m_permissionManager.CanEditObjectPosition(remoteClient.AgentId, ((SceneObjectGroup)ent).UUID) || m_permissionManager.CanEditObject(remoteClient.AgentId, ((SceneObjectGroup)ent).UUID))
                         {
                             ((SceneObjectGroup) ent).IsSelected = false;
-                            LandManager.setPrimsTainted();
+                            LandChannel.setPrimsTainted();
                             break;
                         }
                     }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 94a4e31..8f3495c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -40,7 +40,6 @@ using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.LandManagement;
 using OpenSim.Region.Environment.Modules;
 using OpenSim.Region.Environment.Scenes.Scripting;
 using OpenSim.Region.Physics.Manager;
@@ -154,13 +153,6 @@ namespace OpenSim.Region.Environment.Scenes
             get { return m_authenticateHandler; }
         }
 
-        protected readonly LandManager m_LandManager;
-        // LandManager object instance that manages land related things.  Parcel, primcounts etc..  
-        public LandManager LandManager
-        {
-            get { return m_LandManager; }
-        }
-
         protected readonly EstateManager m_estateManager;
         // an instance to the physics plugin's Scene object.
         public PhysicsScene PhysicsScene
@@ -256,8 +248,6 @@ namespace OpenSim.Region.Environment.Scenes
 
             m_eventManager = new EventManager();
 
-            m_LandManager = new LandManager(this, m_regInfo);
-
             //Bind Storage Manager functions to some land manager functions for this scene
             EventManager.OnLandObjectAdded +=
                 new EventManager.LandObjectAdded(m_storageManager.DataStore.StoreLandObject);
@@ -335,8 +325,6 @@ namespace OpenSim.Region.Environment.Scenes
 
         protected virtual void RegisterDefaultSceneEvents()
         {
-            m_eventManager.OnParcelPrimCountAdd += m_LandManager.addPrimToLandPrimCounts;
-            m_eventManager.OnParcelPrimCountUpdate += addPrimsToParcelCounts;
             m_eventManager.OnPermissionError += SendPermissionAlert;
         }
 
@@ -837,10 +825,12 @@ namespace OpenSim.Region.Environment.Scenes
 
         private void UpdateLand()
         {
-            if (m_LandManager.landPrimCountTainted)
+            if (LandChannel != null)
             {
-                //Perform land update of prim count
-                performParcelPrimCountUpdate();
+                if (LandChannel.isLandPrimCountTainted())
+                {
+                    LandChannel.performParcelPrimCountUpdate();
+                }
             }
         }
 
@@ -974,12 +964,12 @@ namespace OpenSim.Region.Environment.Scenes
                 if (dGridSettings["allow_forceful_banlines"] != "TRUE")
                 {
                     m_log.Info("[GRID]: Grid is disabling forceful parcel banlists");
-                    m_LandManager.allowedForcefulBans = false;
+                    LandChannel.allowedForcefulBans = false;
                 }
                 else
                 {
                     m_log.Info("[GRID]: Grid is allowing forceful parcel banlists");
-                    m_LandManager.allowedForcefulBans = true;
+                    LandChannel.allowedForcefulBans = true;
                 }
             }
         }
@@ -1016,11 +1006,11 @@ namespace OpenSim.Region.Environment.Scenes
 
             if (landData.Count == 0)
             {
-                m_LandManager.NoLandDataFromStorage();
+                LandChannel.NoLandDataFromStorage();
             }
             else
             {
-                m_LandManager.IncomingLandObjectsFromStorage(landData);
+                LandChannel.IncomingLandObjectsFromStorage(landData);
             }
         }
 
@@ -1196,9 +1186,9 @@ namespace OpenSim.Region.Environment.Scenes
         {
             if (Entities.ContainsKey(sceneObject.UUID))
             {
-                m_LandManager.removePrimFromLandPrimCounts(sceneObject);
+                LandChannel.removePrimFromLandPrimCounts(sceneObject);
                 Entities.Remove(sceneObject.UUID);
-                m_LandManager.setPrimsTainted();
+                LandChannel.setPrimsTainted();
                 m_innerScene.RemoveAPrimCount();
             }
         }
@@ -1209,7 +1199,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="prim"></param>
         public void AcknowledgeNewPrim(SceneObjectGroup prim)
         {
-            prim.OnPrimCountTainted += m_LandManager.setPrimsTainted;
+            prim.OnPrimCountTainted += LandChannel.setPrimsTainted;
         }
 
         public void LoadPrimsFromXml(string fileName, bool newIdsFlag, LLVector3 loadOffset)
@@ -1350,7 +1340,7 @@ namespace OpenSim.Region.Environment.Scenes
 
                 CreateAndAddScenePresence(client, child);
 
-                m_LandManager.sendParcelOverlay(client);
+                LandChannel.sendParcelOverlay(client);
                 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
             }
         }
@@ -1387,17 +1377,17 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnObjectDuplicate += m_innerScene.DuplicateObject;
             client.OnUpdatePrimFlags += m_innerScene.UpdatePrimFlags;
             client.OnRequestObjectPropertiesFamily += m_innerScene.RequestObjectPropertiesFamily;
-            client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(m_LandManager.handleParcelPropertiesRequest);
-            client.OnParcelDivideRequest += new ParcelDivideRequest(m_LandManager.handleParcelDivideRequest);
-            client.OnParcelJoinRequest += new ParcelJoinRequest(m_LandManager.handleParcelJoinRequest);
+            client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(LandChannel.handleParcelPropertiesRequest);
+            client.OnParcelDivideRequest += new ParcelDivideRequest(LandChannel.handleParcelDivideRequest);
+            client.OnParcelJoinRequest += new ParcelJoinRequest(LandChannel.handleParcelJoinRequest);
             client.OnParcelPropertiesUpdateRequest +=
-                new ParcelPropertiesUpdateRequest(m_LandManager.handleParcelPropertiesUpdateRequest);
-            client.OnParcelSelectObjects += new ParcelSelectObjects(m_LandManager.handleParcelSelectObjectsRequest);
+                new ParcelPropertiesUpdateRequest(LandChannel.handleParcelPropertiesUpdateRequest);
+            client.OnParcelSelectObjects += new ParcelSelectObjects(LandChannel.handleParcelSelectObjectsRequest);
             client.OnParcelObjectOwnerRequest +=
-                new ParcelObjectOwnerRequest(m_LandManager.handleParcelObjectOwnersRequest);
-            client.OnParcelAccessListRequest += new ParcelAccessListRequest(m_LandManager.handleParcelAccessRequest);
+                new ParcelObjectOwnerRequest(LandChannel.handleParcelObjectOwnersRequest);
+            client.OnParcelAccessListRequest += new ParcelAccessListRequest(LandChannel.handleParcelAccessRequest);
             client.OnParcelAccessListUpdateRequest +=
-                new ParcelAccessListUpdateRequest(m_LandManager.handleParcelAccessUpdateRequest);
+                new ParcelAccessListUpdateRequest(LandChannel.handleParcelAccessUpdateRequest);
 
             client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage);
             client.OnRegionInfoRequest += m_estateManager.HandleRegionInfoRequest;
@@ -1445,7 +1435,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             if (avatar.IsChildAgent)
             {
-                avatar.OnSignificantClientMovement += m_LandManager.handleSignificantClientMovement;
+                avatar.OnSignificantClientMovement += LandChannel.handleSignificantClientMovement;
             }
 
             return avatar;
@@ -2021,31 +2011,7 @@ namespace OpenSim.Region.Environment.Scenes
             }
             return LLUUID.Zero;
         }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public void performParcelPrimCountUpdate()
-        {
-            m_LandManager.resetAllLandPrimCounts();
-            m_eventManager.TriggerParcelPrimCountUpdate();
-            m_LandManager.finalizeLandPrimCountUpdate();
-            m_LandManager.landPrimCountTainted = false;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public void addPrimsToParcelCounts()
-        {
-            foreach (EntityBase obj in Entities.Values)
-            {
-                if (obj is SceneObjectGroup)
-                {
-                    m_eventManager.TriggerParcelPrimCountAdd((SceneObjectGroup)obj);
-                }
-            }
-        }
+        
 
         /// <summary>
         /// This method is a way for the Friends Module to create an instant 
@@ -2455,7 +2421,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         public LLUUID GetLandOwner(float x, float y)
         {
-            Land land = LandManager.getLandObject(x, y);
+            ILandObject land = LandChannel.getLandObject(x, y);
             if (land == null)
             {
                 return LLUUID.Zero;
@@ -2468,12 +2434,12 @@ namespace OpenSim.Region.Environment.Scenes
 
         public LandData GetLandData(float x, float y)
         {
-            return LandManager.getLandObject(x, y).landData;
+            return LandChannel.getLandObject(x, y).landData;
         }
 
         public void SetLandMusicURL(float x, float y, string url)
         {
-            Land land = LandManager.getLandObject(x, y);
+            ILandObject land = LandChannel.getLandObject(x, y);
             if (land == null)
             {
                 return;
@@ -2487,7 +2453,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void SetLandMediaURL(float x, float y, string url)
         {
-            Land land = LandManager.getLandObject(x, y);
+            ILandObject land = LandChannel.getLandObject(x, y);
 
             if (land == null)
             {
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 4002aaf..5551173 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -62,6 +62,8 @@ namespace OpenSim.Region.Environment.Scenes
         //public TerrainEngine Terrain;
         public ITerrainChannel Heightmap;
 
+        public ILandChannel LandChannel;
+
         protected EventManager m_eventManager;
 
         public EventManager EventManager
@@ -69,6 +71,7 @@ namespace OpenSim.Region.Environment.Scenes
             get { return m_eventManager; }
         }
 
+        
         protected string m_datastore;
 
         private uint m_nextLocalId = 8880000;
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index 4df5b10..809507c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -29,7 +29,6 @@ using libsecondlife;
 using System;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.LandManagement;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -106,7 +105,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         public event SceneGroupGrabed OnSceneGroupGrab;
 
-        public delegate void LandObjectAdded(Land newParcel, LLUUID regionUUID);
+        public delegate void LandObjectAdded(ILandObject newParcel);
 
         public event LandObjectAdded OnLandObjectAdded;
 
@@ -352,13 +351,13 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
-        public void TriggerLandObjectAdded(Land newParcel, LLUUID regionID)
+        public void TriggerLandObjectAdded(ILandObject newParcel)
         {
             handlerLandObjectAdded = OnLandObjectAdded;
 
             if (handlerLandObjectAdded != null)
             {
-                handlerLandObjectAdded(newParcel, regionID);
+                handlerLandObjectAdded(newParcel);
             }
         }
 
@@ -371,11 +370,11 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
-        public void TriggerLandObjectUpdated(uint localParcelID, Land newParcel)
+        public void TriggerLandObjectUpdated(uint localParcelID, ILandObject newParcel)
         {
             //triggerLandObjectRemoved(localParcelID);
 
-            TriggerLandObjectAdded(newParcel, newParcel.m_scene.RegionInfo.RegionID);
+            TriggerLandObjectAdded(newParcel);
         }
 
         public void TriggerAvatarEnteringNewParcel(ScenePresence avatar, int localLandID, LLUUID regionID)
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 67a4b97..f58109d 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -371,7 +371,7 @@ namespace OpenSim.Region.Environment.Scenes
             RegisterToEvents();
             SetDirectionVectors();
 
-            m_scene.LandManager.sendLandUpdate(this, true);
+            m_scene.LandChannel.sendLandUpdate(this, true);
         }
 
         public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, byte[] visualParams,
@@ -549,7 +549,7 @@ namespace OpenSim.Region.Environment.Scenes
             //if (!m_gotAllObjectsInScene)
             //{
             m_scene.SendAllSceneObjectsToClient(this);
-            m_scene.LandManager.sendLandUpdate(this, true);
+            m_scene.LandChannel.sendLandUpdate(this, true);
             
             //m_gotAllObjectsInScene = true;
             //}
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs
index 1578348..d0a0e86 100644
--- a/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs
@@ -29,7 +29,7 @@ using System;
 using System.Text;
 using Axiom.Math;
 using OpenSim.Framework.Console;
-using OpenSim.Region.Environment.LandManagement;
+using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 using Key = libsecondlife.LLUUID;
 using Rotation = libsecondlife.LLQuaternion;
@@ -105,7 +105,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
         public void osAddToLandPassList(Key avatar, float hours)
         {
             Vector myPosition = Task.AbsolutePosition;
-            Land myParcel = Scene.LandManager.getLandObject(myPosition.X, myPosition.Y);
+            ILandObject myParcel = Scene.LandChannel.getLandObject(myPosition.X, myPosition.Y);
             if (myParcel == null)
             {
                 //Dont do anything!
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index efcec75..62dcf8c 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -4311,7 +4311,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         public int llGetParcelFlags(LSL_Types.Vector3 pos)
         {
             m_host.AddScriptLPS(1);
-            return (int)World.LandManager.getLandObject((float)pos.x, (float)pos.y).landData.landFlags;
+            return (int)World.LandChannel.getLandObject((float)pos.x, (float)pos.y).landData.landFlags;
         }
 
         public int llGetRegionFlags()
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
index 49a967c..12d6871 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Data;
 using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.LandManagement;
 using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.DataStore.MSSQL
@@ -304,7 +303,7 @@ namespace OpenSim.DataStore.MSSQL
         {
         }
 
-        public void StoreLandObject(Land parcel, LLUUID regionUUID)
+        public void StoreLandObject(ILandObject parcel)
         {
         }
 
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs
index 4f24235..ac451d0 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs
@@ -29,7 +29,6 @@ using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.LandManagement;
 using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.DataStore.NullStorage
@@ -72,7 +71,7 @@ namespace OpenSim.DataStore.NullStorage
         {
         }
 
-        public void StoreLandObject(Land land, LLUUID regionUUID)
+        public void StoreLandObject(ILandObject land)
         {
         }