5 files changed, 919 insertions, 49 deletions

diff --git a/OpenSim/Region/CoreModules/World/Land/DwellModule.cs b/OpenSim/Region/CoreModules/World/Land/DwellModule.cs
index bd22155..d17c517 100644
--- a/OpenSim/Region/CoreModules/World/Land/DwellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/DwellModule.cs
@@ -52,10 +52,12 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.World.Land
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DwellModule")]
-    public class DwellModule : IDwellModule, INonSharedRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DefaultDwellModule")]
+    public class DefaultDwellModule : IDwellModule, INonSharedRegionModule
     {
         private Scene m_scene;
+        private IConfigSource m_Config;
+        private bool m_Enabled = false;
 
         public Type ReplaceableInterface
         {
@@ -64,15 +66,27 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public string Name
         {
-            get { return "DwellModule"; }
+            get { return "DefaultDwellModule"; }
         }
 
         public void Initialise(IConfigSource source)
         {
+            m_Config = source;
+
+            IConfig DwellConfig = m_Config.Configs ["Dwell"];
+
+            if (DwellConfig == null) {
+                m_Enabled = false;
+                return;
+            }
+            m_Enabled = (DwellConfig.GetString ("DwellModule", "DefaultDwellModule") == "DefaultDwellModule");
         }
 
         public void AddRegion(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
             m_scene = scene;
 
             m_scene.EventManager.OnNewClient += OnNewClient;
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 6f3249d..8bd46f6 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -69,13 +69,18 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <summary>
         /// Minimum land unit size in region co-ordinates.
         /// </summary>
+<<<<<<< HEAD
+        public const int LandUnit = 4;
+=======
         public const int landUnit = 4;
+>>>>>>> avn/ubitvar
 
         private static readonly string remoteParcelRequestPath = "0009/";
 
         private LandChannel landChannel;
         private Scene m_scene;
-        
+
+        protected IGroupsModule m_groupManager;
         protected IUserManagement m_userManager;
         protected IPrimCountModule m_primCountModule;
         protected IDialogModule m_Dialog;
@@ -101,8 +106,22 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         // caches ExtendedLandData
         private Cache parcelInfoCache;
+<<<<<<< HEAD
+
+
+        /// <summary>
+        /// Record positions that avatar's are currently being forced to move to due to parcel entry restrictions.
+        /// </summary>
+        private Dictionary<UUID, Vector3> forcedPosition = new Dictionary<UUID, Vector3>();
+=======
         private Dictionary<UUID, Vector3> forcedPosition =
                 new Dictionary<UUID, Vector3>();
+>>>>>>> avn/ubitvar
+
+        // Enables limiting parcel layer info transmission when doing simple updates
+        private bool shouldLimitParcelLayerInfoToViewDistance { get; set; }
+        // "View distance" for sending parcel layer info if asked for from a view point in the region
+        private int parcelLayerViewDistance { get; set; }
 
         #region INonSharedRegionModule Members
 
@@ -113,18 +132,32 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void Initialise(IConfigSource source)
         {
+<<<<<<< HEAD
+            shouldLimitParcelLayerInfoToViewDistance = true;
+            parcelLayerViewDistance = 128;
+            IConfig landManagementConfig = source.Configs["LandManagement"];
+            if (landManagementConfig != null)
+            {
+                shouldLimitParcelLayerInfoToViewDistance = landManagementConfig.GetBoolean("LimitParcelLayerUpdateDistance", shouldLimitParcelLayerInfoToViewDistance);
+                parcelLayerViewDistance = landManagementConfig.GetInt("ParcelLayerViewDistance", parcelLayerViewDistance);
+=======
             IConfig cnf = source.Configs["LandManagement"];
             if (cnf != null)
             {
                 DefaultGodParcelGroup = new UUID(cnf.GetString("DefaultAdministratorGroupUUID", UUID.Zero.ToString()));
                 DefaultGodParcelName = cnf.GetString("DefaultAdministratorParcelName", "Default Parcel");
+>>>>>>> avn/ubitvar
             }
         }
 
         public void AddRegion(Scene scene)
         {
             m_scene = scene;
+<<<<<<< HEAD
+            m_landIDList = new int[m_scene.RegionInfo.RegionSizeX / LandUnit, m_scene.RegionInfo.RegionSizeY / LandUnit];
+=======
             m_landIDList = new int[m_scene.RegionInfo.RegionSizeX / landUnit, m_scene.RegionInfo.RegionSizeY / landUnit];
+>>>>>>> avn/ubitvar
             landChannel = new LandChannel(scene, this);
 
             parcelInfoCache = new Cache();
@@ -158,9 +191,10 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void RegionLoaded(Scene scene)
         {
-             m_userManager = m_scene.RequestModuleInterface<IUserManagement>();         
-             m_primCountModule = m_scene.RequestModuleInterface<IPrimCountModule>();
-             m_Dialog = m_scene.RequestModuleInterface<IDialogModule>();
+            m_userManager = m_scene.RequestModuleInterface<IUserManagement>();
+            m_groupManager = m_scene.RequestModuleInterface<IGroupsModule>();
+            m_primCountModule = m_scene.RequestModuleInterface<IPrimCountModule>();
+            m_Dialog = m_scene.RequestModuleInterface<IDialogModule>();
         }
 
         public void RemoveRegion(Scene scene)
@@ -265,7 +299,11 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 m_landList.Clear();
                 m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1;
+<<<<<<< HEAD
+                m_landIDList = new int[m_scene.RegionInfo.RegionSizeX / LandUnit, m_scene.RegionInfo.RegionSizeY / LandUnit];
+=======
                 m_landIDList = new int[m_scene.RegionInfo.RegionSizeX / landUnit, m_scene.RegionInfo.RegionSizeY / landUnit];
+>>>>>>> avn/ubitvar
             }
         }
         
@@ -275,9 +313,16 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <returns>The parcel created.</returns>
         protected ILandObject CreateDefaultParcel()
         {
+<<<<<<< HEAD
+            m_log.DebugFormat(
+                "[LAND MANAGEMENT MODULE]: Creating default parcel for region {0}", m_scene.RegionInfo.RegionName);
+            
+            ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene);                                                
+=======
             m_log.DebugFormat("{0} Creating default parcel for region {1}", LogHeader, m_scene.RegionInfo.RegionName);
 
             ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene);
+>>>>>>> avn/ubitvar
             fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0,
                                             (int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY));
             fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
@@ -411,10 +456,15 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void SendLandUpdate(ScenePresence avatar, bool force)
         {
+<<<<<<< HEAD
+            ILandObject over = GetLandObject((int)Math.Min(((int)m_scene.RegionInfo.RegionSizeX - 1), Math.Max(0, Math.Round(avatar.AbsolutePosition.X))),
+                                             (int)Math.Min(((int)m_scene.RegionInfo.RegionSizeY - 1), Math.Max(0, Math.Round(avatar.AbsolutePosition.Y))));
+=======
             if (avatar.IsChildAgent)
                 return;
 
             ILandObject over = GetLandObjectClipedXY(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+>>>>>>> avn/ubitvar
 
             if (over != null)
             {
@@ -487,16 +537,13 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// </summary>
         /// <param name="avatar"></param>
         public void EventManagerOnClientMovement(ScenePresence avatar)
-        //
         {
-            ILandObject over = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+            Vector3 pos = avatar.AbsolutePosition;
+            ILandObject over = GetLandObject(pos.X, pos.Y);
             if (over != null)
             {
-                if (!over.IsRestrictedFromLand(avatar.UUID) && (!over.IsBannedFromLand(avatar.UUID) || avatar.AbsolutePosition.Z >= LandChannel.BAN_LINE_SAFETY_HIEGHT))
-                {
-                    avatar.lastKnownAllowedPosition =
-                        new Vector3(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z);
-                }
+                if (!over.IsRestrictedFromLand(avatar.UUID) && (!over.IsBannedFromLand(avatar.UUID) || pos.Z >= LandChannel.BAN_LINE_SAFETY_HIEGHT))
+                    avatar.lastKnownAllowedPosition = pos;
             }
         }
 
@@ -555,7 +602,10 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <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>
+        /// <param name="new_land">
+        /// The land object being added.  
+        /// Will return null if this overlaps with an existing parcel that has not had its bitmap adjusted.
+        /// </param>
         public ILandObject AddLandObject(ILandObject land)
         {
             ILandObject new_land = land.Copy();
@@ -567,21 +617,32 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             lock (m_landList)
             {
-                int newLandLocalID = ++m_lastLandLocalID;
+                int newLandLocalID = m_lastLandLocalID + 1;
                 new_land.LandData.LocalID = newLandLocalID;
 
                 bool[,] landBitmap = new_land.GetLandBitmap();
+<<<<<<< HEAD
+                // m_log.DebugFormat("{0} AddLandObject. new_land.bitmapSize=({1},{2}). newLocalID={3}",
+                //                 LogHeader, landBitmap.GetLength(0), landBitmap.GetLength(1), newLandLocalID);
+
+=======
+>>>>>>> avn/ubitvar
                 if (landBitmap.GetLength(0) != m_landIDList.GetLength(0) || landBitmap.GetLength(1) != m_landIDList.GetLength(1))
                 {
                     // Going to variable sized regions can cause mismatches
                     m_log.ErrorFormat("{0} AddLandObject. Added land bitmap different size than region ID map. bitmapSize=({1},{2}), landIDSize=({3},{4})",
+<<<<<<< HEAD
+                        LogHeader, landBitmap.GetLength(0), landBitmap.GetLength(1), m_landIDList.GetLength(0), m_landIDList.GetLength(1) );
+=======
                         LogHeader, landBitmap.GetLength(0), landBitmap.GetLength(1), m_landIDList.GetLength(0), m_landIDList.GetLength(1));
+>>>>>>> avn/ubitvar
                 }
                 else
                 {
                     // If other land objects still believe that they occupy any parts of the same space, 
                     // then do not allow the add to proceed.
                     for (int x = 0; x < landBitmap.GetLength(0); x++)
+<<<<<<< HEAD
                     {
                         for (int y = 0; y < landBitmap.GetLength(1); y++)
                         {
@@ -597,6 +658,40 @@ namespace OpenSim.Region.CoreModules.World.Land
                                     {
                                         m_log.ErrorFormat(
                                             "{0}: Cannot add parcel \"{1}\", local ID {2} at tile {3},{4} because this is still occupied by parcel \"{5}\", local ID {6} in {7}",
+                                            LogHeader, new_land.LandData.Name, new_land.LandData.LocalID, x, y, 
+                                            lastRecordedLo.LandData.Name, lastRecordedLo.LandData.LocalID, m_scene.Name);
+
+                                        return null;
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    for (int x = 0; x < landBitmap.GetLength(0); x++)
+=======
+>>>>>>> avn/ubitvar
+                    {
+                        for (int y = 0; y < landBitmap.GetLength(1); y++)
+                        {
+                            if (landBitmap[x, y])
+                            {
+<<<<<<< HEAD
+                                // m_log.DebugFormat(
+                                //     "[LAND MANAGEMENT MODULE]: Registering parcel {0} for land co-ord ({1}, {2}) on {3}", 
+                                //     new_land.LandData.Name, x, y, m_scene.RegionInfo.RegionName);
+                                    
+=======
+                                int lastRecordedLandId = m_landIDList[x, y];
+
+                                if (lastRecordedLandId > 0)
+                                {
+                                    ILandObject lastRecordedLo = m_landList[lastRecordedLandId];
+
+                                    if (lastRecordedLo.LandBitmap[x, y])
+                                    {
+                                        m_log.ErrorFormat(
+                                            "{0}: Cannot add parcel \"{1}\", local ID {2} at tile {3},{4} because this is still occupied by parcel \"{5}\", local ID {6} in {7}",
                                             LogHeader, new_land.LandData.Name, new_land.LandData.LocalID, x, y,
                                             lastRecordedLo.LandData.Name, lastRecordedLo.LandData.LocalID, m_scene.Name);
 
@@ -617,6 +712,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                                 //                                "[LAND MANAGEMENT MODULE]: Registering parcel {0} for land co-ord ({1}, {2}) on {3}", 
                                 //                                new_land.LandData.Name, x, y, m_scene.RegionInfo.RegionName);
 
+>>>>>>> avn/ubitvar
                                 m_landIDList[x, y] = newLandLocalID;
                             }
                         }
@@ -624,10 +720,12 @@ namespace OpenSim.Region.CoreModules.World.Land
                 }
 
                 m_landList.Add(newLandLocalID, new_land);
+                m_lastLandLocalID++;
             }
 
             new_land.ForceUpdateLandInfo();
             m_scene.EventManager.TriggerLandObjectAdded(new_land);
+
             return new_land;
         }
 
@@ -731,6 +829,33 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <returns>Land object at the point supplied</returns>
         public ILandObject GetLandObject(float x_float, float y_float)
         {
+<<<<<<< HEAD
+            return GetLandObject((int)x_float, (int)y_float, true /* returnNullIfLandObjectNotFound */);
+            /*
+            int x;
+            int y;
+
+            if (x_float >= m_scene.RegionInfo.RegionSizeX || x_float < 0 || y_float >= m_scene.RegionInfo.RegionSizeX || y_float < 0)
+                return null;
+
+            try
+            {
+                x = Convert.ToInt32(Math.Floor(Convert.ToDouble(x_float) / (float)landUnit));
+                y = Convert.ToInt32(Math.Floor(Convert.ToDouble(y_float) / (float)landUnit));
+            }
+            catch (OverflowException)
+            {
+                return null;
+            }
+
+            if (x >= (m_scene.RegionInfo.RegionSizeX / landUnit)
+                    || y >= (m_scene.RegionInfo.RegionSizeY / landUnit)
+                    || x < 0
+                    || y < 0)
+            {
+                return null;
+            }
+=======
             return GetLandObject((int)x_float, (int)y_float, true);
         }
 
@@ -750,9 +875,34 @@ namespace OpenSim.Region.CoreModules.World.Land
                 avy = 0;
             else if (avy >= m_scene.RegionInfo.RegionSizeY)
                 avy = (int)Constants.RegionSize - 1;
+>>>>>>> avn/ubitvar
 
             lock (m_landIDList)
             {
+<<<<<<< HEAD
+                // Corner case. If an autoreturn happens during sim startup
+                // we will come here with the list uninitialized
+                //
+//                int landId = m_landIDList[x, y];
+                
+//                if (landId == 0)
+//                    m_log.DebugFormat(
+//                        "[LAND MANAGEMENT MODULE]: No land object found at ({0}, {1}) on {2}", 
+//                        x, y, m_scene.RegionInfo.RegionName);
+
+                try
+                {
+                    if (m_landList.ContainsKey(m_landIDList[x, y]))
+                        return m_landList[m_landIDList[x, y]];
+                }
+                catch (Exception e)
+                {
+                    m_log.DebugFormat("{0} GetLandObject exception. x={1}, y={2}, m_landIDList.len=({3},{4})",
+                        LogHeader, x, y, m_landIDList.GetLength(0), m_landIDList.GetLength(1));
+                }
+                
+                return null;
+=======
                 try
                 {
                     return m_landList[m_landIDList[avx / landUnit, avy / landUnit]];
@@ -761,23 +911,50 @@ namespace OpenSim.Region.CoreModules.World.Land
                 {
                     return null;
                 }
+>>>>>>> avn/ubitvar
             }
+             */
         }
 
+        // Public entry.
+        // Throws exception if land object is not found
         public ILandObject GetLandObject(int x, int y)
         {
             return GetLandObject(x, y, false /* returnNullIfLandObjectNotFound */);
         }
 
+<<<<<<< HEAD
+        /// <summary>
+        /// Given a region position, return the parcel land object for that location
+        /// </summary>
+        /// <returns>
+        /// The land object.
+        /// </returns>
+        /// <param name='x'></param>
+        /// <param name='y'></param>
+        /// <param name='returnNullIfLandObjectNotFound'>
+        /// Return null if the land object requested is not within the region's bounds.
+        /// </param>
+        private ILandObject GetLandObject(int x, int y, bool returnNullIfLandObjectOutsideBounds)
+        {
+            if (x >= m_scene.RegionInfo.RegionSizeX || y >=  m_scene.RegionInfo.RegionSizeY || x < 0 || y < 0)
+=======
         public ILandObject GetLandObject(int x, int y, bool returnNullIfLandObjectOutsideBounds)
         {
             if (x >= m_scene.RegionInfo.RegionSizeX || y >= m_scene.RegionInfo.RegionSizeY || x < 0 || y < 0)
+>>>>>>> avn/ubitvar
             {
                 // These exceptions here will cause a lot of complaints from the users specifically because
                 // they happen every time at border crossings
                 if (returnNullIfLandObjectOutsideBounds)
                     return null;
                 else
+<<<<<<< HEAD
+                    throw new Exception(
+                        String.Format("{0} GetLandObject for non-existent position. Region={1}, pos=<{2},{3}",
+                                                LogHeader, m_scene.RegionInfo.RegionName, x, y)
+                );
+=======
                     throw new Exception("Error: Parcel not found at point " + x + ", " + y);
             }
 
@@ -791,7 +968,23 @@ namespace OpenSim.Region.CoreModules.World.Land
                 {
                         return null;
                 }
+>>>>>>> avn/ubitvar
             }
+
+            return m_landList[m_landIDList[x / 4, y / 4]];
+        }
+
+        // Create a 'parcel is here' bitmap for the parcel identified by the passed landID
+        private bool[,] CreateBitmapForID(int landID)
+        {
+            bool[,] ret = new bool[m_landIDList.GetLength(0), m_landIDList.GetLength(1)];
+
+            for (int xx = 0; xx < m_landIDList.GetLength(0); xx++)
+                for (int yy = 0; yy < m_landIDList.GetLength(0); yy++)
+                    if (m_landIDList[xx, yy] == landID)
+                        ret[xx, yy] = true;
+
+            return ret;
         }
 
         // Create a 'parcel is here' bitmap for the parcel identified by the passed landID
@@ -976,10 +1169,19 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             //Now add the new land object
             ILandObject result = AddLandObject(newLand);
+<<<<<<< HEAD
+
+            if (result != null)
+            {
+                UpdateLandObject(startLandObject.LandData.LocalID, startLandObject.LandData);
+                result.SendLandUpdateToAvatarsOverMe();
+            }
+=======
             UpdateLandObject(startLandObject.LandData.LocalID, startLandObject.LandData);
             result.SendLandUpdateToAvatarsOverMe();
             startLandObject.SendLandUpdateToAvatarsOverMe();
             m_scene.ForEachClient(SendParcelOverlay);
+>>>>>>> avn/ubitvar
         }
 
         /// <summary>
@@ -1061,12 +1263,29 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         #region Parcel Updating
 
+<<<<<<< HEAD
+        // Send parcel layer info for the whole region
+        public void SendParcelOverlay(IClientAPI remote_client)
+        {
+            SendParcelOverlay(remote_client, 0, 0, (int)Constants.MaximumRegionSize);
+        }
+=======
+>>>>>>> avn/ubitvar
 
         /// <summary>
-        /// Where we send the ParcelOverlay packet to the client
+        /// Send the parcel overlay blocks to the client. We send the overlay packets
+        /// around a location and limited by the 'parcelLayerViewDistance'. This number
+        /// is usually 128 and the code is arranged so it sends all the parcel overlay
+        /// information for a whole region if the region is legacy sized (256x256). If
+        /// the region is larger, only the parcel layer information is sent around
+        /// the point specified. This reduces the problem of parcel layer information
+        /// blocks increasing exponentially as region size increases.
         /// </summary>
         /// <param name="remote_client">The object representing the client</param>
-        public void SendParcelOverlay(IClientAPI remote_client)
+        /// <param name="xPlace">X position in the region to send surrounding parcel layer info</param>
+        /// <param name="yPlace">y position in the region to send surrounding parcel layer info</param>
+        /// <param name="layerViewDistance">Distance from x,y position to send parcel layer info</param>
+        private  void SendParcelOverlay(IClientAPI remote_client, int xPlace, int yPlace, int layerViewDistance)
         {
             if (remote_client.SceneAgent.PresenceType == PresenceType.Npc)
                 return;
@@ -1076,18 +1295,149 @@ namespace OpenSim.Region.CoreModules.World.Land
             byte[] byteArray = new byte[LAND_BLOCKS_PER_PACKET];
             int byteArrayCount = 0;
             int sequenceID = 0;
+<<<<<<< HEAD
+
+            int xLow = 0;
+            int xHigh = (int)m_scene.RegionInfo.RegionSizeX;
+            int yLow = 0;
+            int yHigh = (int)m_scene.RegionInfo.RegionSizeY;
+
+            if (shouldLimitParcelLayerInfoToViewDistance)
+            {
+                // Compute view distance around the given point
+                int txLow = xPlace - layerViewDistance;
+                int txHigh = xPlace + layerViewDistance;
+                // If the distance is outside the region area, move the view distance to ba all in the region
+                if (txLow < xLow)
+=======
 
             // Layer data is in landUnit (4m) chunks
             for (int y = 0; y < m_scene.RegionInfo.RegionSizeY; y += landUnit)
             {
                 for (int x = 0; x < m_scene.RegionInfo.RegionSizeX; x += landUnit)
+>>>>>>> avn/ubitvar
                 {
-                    byte tempByte = 0; //This represents the byte for the current 4x4
+                    txLow = xLow;
+                    txHigh = Math.Min(yLow + (layerViewDistance * 2), xHigh);
+                }
+                if (txHigh > xHigh)
+                {
+                    txLow = Math.Max(xLow, xHigh - (layerViewDistance * 2));
+                    txHigh = xHigh;
+                }
+                xLow = txLow;
+                xHigh = txHigh;
 
+<<<<<<< HEAD
+                int tyLow = yPlace - layerViewDistance;
+                int tyHigh = yPlace + layerViewDistance;
+                if (tyLow < yLow)
+                {
+                    tyLow = yLow;
+                    tyHigh = Math.Min(yLow + (layerViewDistance * 2), yHigh);
+                }
+                if (tyHigh > yHigh)
+                {
+                    tyLow = Math.Max(yLow, yHigh - (layerViewDistance * 2));
+                    tyHigh = yHigh;
+                }
+                yLow = tyLow;
+                yHigh = tyHigh;
+            }
+            // m_log.DebugFormat("{0} SendParcelOverlay: place=<{1},{2}>, vDist={3}, xLH=<{4},{5}, yLH=<{6},{7}>",
+            //     LogHeader, xPlace, yPlace, layerViewDistance, xLow, xHigh, yLow, yHigh);
+=======
                     ILandObject currentParcelBlock = GetLandObject(x, y);
+>>>>>>> avn/ubitvar
 
-                    if (currentParcelBlock != null)
+            // Layer data is in landUnit (4m) chunks
+            for (int y = yLow; y < yHigh / Constants.TerrainPatchSize * (Constants.TerrainPatchSize / LandUnit); y++)
+            {
+                for (int x = xLow; x < xHigh / Constants.TerrainPatchSize * (Constants.TerrainPatchSize / LandUnit); x++)
+                {
+                    byteArray[byteArrayCount] = BuildLayerByte(GetLandObject(x * LandUnit, y * LandUnit), x, y, remote_client);
+                    byteArrayCount++;
+                    if (byteArrayCount >= LAND_BLOCKS_PER_PACKET)
                     {
+<<<<<<< HEAD
+                        // m_log.DebugFormat("{0} SendParcelOverlay, sending packet, bytes={1}", LogHeader, byteArray.Length);
+                        remote_client.SendLandParcelOverlay(byteArray, sequenceID);
+                        byteArrayCount = 0;
+                        sequenceID++;
+                        byteArray = new byte[LAND_BLOCKS_PER_PACKET];
+                    }
+
+                }
+            }
+
+            if (byteArrayCount != 0)
+            {
+                remote_client.SendLandParcelOverlay(byteArray, sequenceID);
+                // m_log.DebugFormat("{0} SendParcelOverlay, complete sending packet, bytes={1}", LogHeader, byteArray.Length);
+            }
+        }
+
+        private byte BuildLayerByte(ILandObject currentParcelBlock, int x, int y, IClientAPI remote_client)
+        {
+            byte tempByte = 0; //This represents the byte for the current 4x4
+
+            if (currentParcelBlock != null)
+            {
+                if (currentParcelBlock.LandData.OwnerID == remote_client.AgentId)
+                {
+                    //Owner Flag
+                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_REQUESTER);
+                }
+                else if (currentParcelBlock.LandData.SalePrice > 0 &&
+                         (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero ||
+                          currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId))
+                {
+                    //Sale Flag
+                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_IS_FOR_SALE);
+                }
+                else if (currentParcelBlock.LandData.OwnerID == UUID.Zero)
+                {
+                    //Public Flag
+                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_PUBLIC);
+                }
+                else
+                {
+                    //Other Flag
+                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_OTHER);
+                }
+
+                //Now for border control
+
+                ILandObject westParcel = null;
+                ILandObject southParcel = null;
+                if (x > 0)
+                {
+                    westParcel = GetLandObject((x - 1) * LandUnit, y * LandUnit);
+                }
+                if (y > 0)
+                {
+                    southParcel = GetLandObject(x * LandUnit, (y - 1) * LandUnit);
+                }
+
+                if (x == 0)
+                {
+                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_WEST);
+                }
+                else if (westParcel != null && westParcel != currentParcelBlock)
+                {
+                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_WEST);
+                }
+
+                if (y == 0)
+                {
+                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_SOUTH);
+                }
+                else if (southParcel != null && southParcel != currentParcelBlock)
+                {
+                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_SOUTH);
+                }
+
+=======
                         // types 
                         if (currentParcelBlock.LandData.OwnerID == remote_client.AgentId)
                         {
@@ -1175,7 +1525,10 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (byteArrayCount > 0)
             {
                 remote_client.SendLandParcelOverlay(byteArray, sequenceID);
+>>>>>>> avn/ubitvar
             }
+
+            return tempByte;
         }
 
         public void ClientOnParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id,
@@ -1216,6 +1569,10 @@ namespace OpenSim.Region.CoreModules.World.Land
                 temp[i].SendLandProperties(sequence_id, snap_selection, requestResult, remote_client);
             }
 
+<<<<<<< HEAD
+            // Also send the layer data around the point of interest
+            SendParcelOverlay(remote_client, (start_x + end_x) / 2, (start_y + end_y) / 2, parcelLayerViewDistance);
+=======
 //            SendParcelOverlay(remote_client);
         }
 
@@ -1255,6 +1612,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                          avatar.currentParcelUUID = parcelID; // force parcel flags review
                  });
             }
+>>>>>>> avn/ubitvar
         }
 
         public void ClientOnParcelPropertiesUpdateRequest(LandUpdateArgs args, int localID, IClientAPI remote_client)
@@ -1325,6 +1683,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     land.LandData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
                     m_scene.ForEachClient(SendParcelOverlay);
                     land.SendLandUpdateToClient(true, remote_client);
+                    UpdateLandObject(land.LandData.LocalID, land.LandData);
                 }
             }
         }
@@ -1345,8 +1704,10 @@ namespace OpenSim.Region.CoreModules.World.Land
                     land.LandData.GroupID = UUID.Zero;
                     land.LandData.IsGroupOwned = false;
                     land.LandData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
+                    
                     m_scene.ForEachClient(SendParcelOverlay);
                     land.SendLandUpdateToClient(true, remote_client);
+                    UpdateLandObject(land.LandData.LocalID, land.LandData);
                 }
             }
         }
@@ -1372,6 +1733,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     land.LandData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
                     m_scene.ForEachClient(SendParcelOverlay);
                     land.SendLandUpdateToClient(true, remote_client);
+                    UpdateLandObject(land.LandData.LocalID, land.LandData);
                 }
             }
         }
@@ -1452,24 +1814,42 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         #region Land Object From Storage Functions
 
-        public void EventManagerOnIncomingLandDataFromStorage(List<LandData> data)
+        private void EventManagerOnIncomingLandDataFromStorage(List<LandData> data)
         {
             lock (m_landList)
             {
                 for (int i = 0; i < data.Count; i++)
                     IncomingLandObjectFromStorage(data[i]);
 
+<<<<<<< HEAD
+            // Prevent race conditions from any auto-creation of new parcels for varregions whilst we are still loading
+            // the existing parcels.
+            lock (m_landList)
+            {
+                for (int i = 0; i < data.Count; i++)
+                    IncomingLandObjectFromStorage(data[i]);
+
+                // Layer data is in landUnit (4m) chunks
+                for (int y = 0; y < m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize * (Constants.TerrainPatchSize / LandUnit); y++)
+                {
+                    for (int x = 0; x < m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize * (Constants.TerrainPatchSize / LandUnit); x++)
+=======
                 // Layer data is in landUnit (4m) chunks
                 for (int y = 0; y < m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize * (Constants.TerrainPatchSize / landUnit); y++)
                 {
                     for (int x = 0; x < m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize * (Constants.TerrainPatchSize / landUnit); x++)
+>>>>>>> avn/ubitvar
                     {
                         if (m_landIDList[x, y] == 0)
                         {
                             if (m_landList.Count == 1)
                             {
                                 m_log.DebugFormat(
+<<<<<<< HEAD
+                                    "[{0}]: Auto-extending land parcel as landID at {1},{2} is 0 and only one land parcel is present in {3}", 
+=======
                                     "[{0}]: Auto-extending land parcel as landID at {1},{2} is 0 and only one land parcel is present in {3}",
+>>>>>>> avn/ubitvar
                                     LogHeader, x, y, m_scene.Name);
 
                                 int onlyParcelID = 0;
@@ -1492,11 +1872,19 @@ namespace OpenSim.Region.CoreModules.World.Land
                             else if (m_landList.Count > 1)
                             {
                                 m_log.DebugFormat(
+<<<<<<< HEAD
+                                    "{0}: Auto-creating land parcel as landID at {1},{2} is 0 and more than one land parcel is present in {3}", 
+                                    LogHeader, x, y, m_scene.Name);
+
+                                // There are several other parcels so we must create a new one for the unassigned space
+                                ILandObject newLand = new LandObject(UUID.Zero, false, m_scene);                                                
+=======
                                     "{0}: Auto-creating land parcel as landID at {1},{2} is 0 and more than one land parcel is present in {3}",
                                     LogHeader, x, y, m_scene.Name);
 
                                 // There are several other parcels so we must create a new one for the unassigned space
                                 ILandObject newLand = new LandObject(UUID.Zero, false, m_scene);
+>>>>>>> avn/ubitvar
                                 // Claim all the unclaimed "0" ids
                                 newLand.SetLandBitmap(CreateBitmapForID(0));
                                 newLand.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
@@ -1507,7 +1895,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                             {
                                 // We should never reach this point as the separate code path when no land data exists should have fired instead.
                                 m_log.WarnFormat(
+<<<<<<< HEAD
+                                    "{0}: Ignoring request to auto-create parcel in {1} as there are no other parcels present", 
+=======
                                     "{0}: Ignoring request to auto-create parcel in {1} as there are no other parcels present",
+>>>>>>> avn/ubitvar
                                     LogHeader, m_scene.Name);
                             }
                         }
@@ -1516,11 +1908,15 @@ namespace OpenSim.Region.CoreModules.World.Land
             }
         }
 
-        public void IncomingLandObjectFromStorage(LandData data)
+        private void IncomingLandObjectFromStorage(LandData data)
         {
+<<<<<<< HEAD
+            ILandObject new_land = new LandObject(data, m_scene);
+=======
 
             ILandObject new_land = new LandObject(data.OwnerID, data.IsGroupOwned, m_scene);
             new_land.LandData = data.Copy();
+>>>>>>> avn/ubitvar
             new_land.SetLandBitmapFromByteArray();            
             AddLandObject(new_land);
 //            new_land.SendLandUpdateToAvatarsOverMe();
@@ -2057,21 +2453,38 @@ namespace OpenSim.Region.CoreModules.World.Land
                 telehub = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject);
 
             // Can the user set home here?
-            if (// (a) gods and land managers can set home
-                m_scene.Permissions.IsAdministrator(remoteClient.AgentId) || 
-                m_scene.Permissions.IsGod(remoteClient.AgentId) ||
-                // (b) land owners can set home
-                remoteClient.AgentId == land.LandData.OwnerID ||
-                // (c) members of the land-associated group in roles that can set home
-                ((gpowers & (ulong)GroupPowers.AllowSetHome) == (ulong)GroupPowers.AllowSetHome) ||
-                // (d) parcels with telehubs can be the home of anyone
-                (telehub != null && land.ContainsPoint((int)telehub.AbsolutePosition.X, (int)telehub.AbsolutePosition.Y)))
-            {
-                if (m_scene.GridUserService.SetHome(remoteClient.AgentId.ToString(), land.RegionUUID, position, lookAt))
+            if (// Required: local user; foreign users cannot set home
+                m_scene.UserManagementModule.IsLocalGridUser(remoteClient.AgentId) &&
+                (// (a) gods and land managers can set home
+                 m_scene.Permissions.IsAdministrator(remoteClient.AgentId) || 
+                 m_scene.Permissions.IsGod(remoteClient.AgentId) ||
+                 // (b) land owners can set home
+                 remoteClient.AgentId == land.LandData.OwnerID ||
+                 // (c) members of the land-associated group in roles that can set home
+                 ((gpowers & (ulong)GroupPowers.AllowSetHome) == (ulong)GroupPowers.AllowSetHome) ||
+                 // (d) parcels with telehubs can be the home of anyone
+                 (telehub != null && land.ContainsPoint((int)telehub.AbsolutePosition.X, (int)telehub.AbsolutePosition.Y))))
+            {
+                string userId;
+                UUID test;
+                if (!m_scene.UserManagementModule.GetUserUUI(remoteClient.AgentId, out userId))
+                {
+                    /* Do not set a home position in this grid for a HG visitor */
+                    m_Dialog.SendAlertToUser(remoteClient, "Set Home request failed. (User Lookup)");
+                }
+                else if (!UUID.TryParse(userId, out test))
+                {
+                    m_Dialog.SendAlertToUser(remoteClient, "Set Home request failed. (HG visitor)");
+                }
+                else if (m_scene.GridUserService.SetHome(userId, land.RegionUUID, position, lookAt))
+                {
                     // FUBAR ALERT: this needs to be "Home position set." so the viewer saves a home-screenshot.
                     m_Dialog.SendAlertToUser(remoteClient, "Home position set.");
+                }
                 else
+                {
                     m_Dialog.SendAlertToUser(remoteClient, "Set Home request failed.");
+                }
             }
             else
                 m_Dialog.SendAlertToUser(remoteClient, "You are not allowed to set your home location in this parcel.");
@@ -2155,6 +2568,17 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         private void AppendParcelsSummaryReport(StringBuilder report)
         {           
+<<<<<<< HEAD
+            report.AppendFormat("Land information for {0}\n", m_scene.Name);
+
+            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+            cdt.AddColumn("Parcel Name", ConsoleDisplayUtil.ParcelNameSize);
+            cdt.AddColumn("ID", 3);
+            cdt.AddColumn("Area", 6);
+            cdt.AddColumn("Starts", ConsoleDisplayUtil.VectorSize);
+            cdt.AddColumn("Ends", ConsoleDisplayUtil.VectorSize);
+            cdt.AddColumn("Owner", ConsoleDisplayUtil.UserNameSize);
+=======
             report.AppendFormat("Land information for {0}\n", m_scene.RegionInfo.RegionName);            
             report.AppendFormat(
                 "{0,-20} {1,-10} {2,-9} {3,-18} {4,-18} {5,-20}\n",
@@ -2164,12 +2588,27 @@ namespace OpenSim.Region.CoreModules.World.Land
                 "AABBMin",
                 "AABBMax",
                 "Owner");
+>>>>>>> avn/ubitvar
             
             lock (m_landList)
             {
                 foreach (ILandObject lo in m_landList.Values)
                 {
                     LandData ld = lo.LandData;
+<<<<<<< HEAD
+                    string ownerName;
+                    if (ld.IsGroupOwned)
+                    {
+                        GroupRecord rec = m_groupManager.GetGroupRecord(ld.GroupID);
+                        ownerName = (rec != null) ? rec.GroupName : "Unknown Group";
+                    }
+                    else
+                    {
+                        ownerName = m_userManager.GetUserName(ld.OwnerID);
+                    }
+                    cdt.AddRow(
+                        ld.Name, ld.LocalID, ld.Area, lo.StartPoint, lo.EndPoint, ownerName);
+=======
                     
                     report.AppendFormat(
                         "{0,-20} {1,-10} {2,-9} {3,-18} {4,-18} {5,-20}\n", 
@@ -2197,8 +2636,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                 else
                 {
                     ForceAvatarToPosition(avatar, avatar.lastKnownAllowedPosition);
+>>>>>>> avn/ubitvar
                 }
             }
+
+            report.Append(cdt.ToString());
         } 
 
         private void AppendParcelReport(StringBuilder report, ILandObject lo)
@@ -2213,8 +2655,17 @@ namespace OpenSim.Region.CoreModules.World.Land
             cdl.AddRow("Area", ld.Area);
             cdl.AddRow("AABB Min", ld.AABBMin);
             cdl.AddRow("AABB Max", ld.AABBMax);
-
-            cdl.AddRow("Owner", m_userManager.GetUserName(ld.OwnerID));
+            string ownerName;
+            if (ld.IsGroupOwned)
+            {
+                GroupRecord rec = m_groupManager.GetGroupRecord(ld.GroupID);
+                ownerName = (rec != null) ? rec.GroupName : "Unknown Group";
+            }
+            else
+            {
+                ownerName = m_userManager.GetUserName(ld.OwnerID);
+            }
+            cdl.AddRow("Owner", ownerName);
             cdl.AddRow("Is group owned?", ld.IsGroupOwned);
             cdl.AddRow("GroupID", ld.GroupID);
 
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 5858d6c..3b81d6b 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -46,12 +46,20 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static readonly string LogHeader = "[LAND OBJECT]";
+<<<<<<< HEAD
+
+        private readonly int landUnit = 4;
+
+        private int m_lastSeqId = 0;
+              
+=======
 
         private readonly int landUnit = 4;
 
         private int m_lastSeqId = 0;
         private int m_expiryCounter = 0;
 
+>>>>>>> avn/ubitvar
         protected Scene m_scene;
         protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>();
         protected Dictionary<uint, UUID> m_listTransactions = new Dictionary<uint, UUID>();
@@ -59,22 +67,29 @@ namespace OpenSim.Region.CoreModules.World.Land
         protected ExpiringCache<UUID, bool> m_groupMemberCache = new ExpiringCache<UUID, bool>();
         protected TimeSpan m_groupMemberCacheTimeout = TimeSpan.FromSeconds(30);  // cache invalidation after 30 seconds
 
+<<<<<<< HEAD
+        public bool[,] LandBitmap { get; set; }
+=======
         private bool[,] m_landBitmap;
         public bool[,] LandBitmap
         {
             get { return m_landBitmap; }
             set { m_landBitmap = value; }
         }
+>>>>>>> avn/ubitvar
 
         #endregion
 
         public int GetPrimsFree()
         {
             m_scene.EventManager.TriggerParcelPrimCountUpdate();
-            int free = GetSimulatorMaxPrimCount() - m_landData.SimwidePrims;
+            int free = GetSimulatorMaxPrimCount() - LandData.SimwidePrims;
             return free;
         }
 
+<<<<<<< HEAD
+        public LandData LandData { get; set; }
+=======
         protected LandData m_landData;        
         public LandData LandData
         {
@@ -82,6 +97,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             set { m_landData = value; }
         }
+>>>>>>> avn/ubitvar
 
         public IPrimCounts PrimCounts { get; set; }
 
@@ -103,6 +119,8 @@ namespace OpenSim.Region.CoreModules.World.Land
                     }
                 }
 
+                m_log.ErrorFormat("{0} StartPoint. No start point found. bitmapSize=<{1},{2}>",
+                                    LogHeader, LandBitmap.GetLength(0), LandBitmap.GetLength(1));
                 return new Vector3(-1, -1, -1);
             }
         }
@@ -122,6 +140,8 @@ namespace OpenSim.Region.CoreModules.World.Land
                     }
                 }
 
+                m_log.ErrorFormat("{0} EndPoint. No end point found. bitmapSize=<{1},{2}>",
+                                    LogHeader, LandBitmap.GetLength(0), LandBitmap.GetLength(1));
                 return new Vector3(-1, -1, -1);
             }
         }
@@ -179,12 +199,8 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public ILandObject Copy()
         {
-            ILandObject newLand = new LandObject(LandData.OwnerID, LandData.IsGroupOwned, m_scene);
-
-            //Place all new variables here!
+            ILandObject newLand = new LandObject(LandData, m_scene);
             newLand.LandBitmap = (bool[,]) (LandBitmap.Clone());
-            newLand.LandData = LandData.Copy();
-
             return newLand;
         }
 
@@ -209,6 +225,12 @@ namespace OpenSim.Region.CoreModules.World.Land
             else
             {
                 // Normal Calculations
+<<<<<<< HEAD
+                int parcelMax = (int)(((float)LandData.Area / (m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY))
+                              * (float)m_scene.RegionInfo.ObjectCapacity
+                              * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus);
+                // TODO: The calculation of ObjectBonus should be refactored. It does still not work in the same manner as SL!
+=======
                 int parcelMax = (int)( (long)LandData.Area
                               * (long)m_scene.RegionInfo.ObjectCapacity
                               * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus
@@ -230,6 +252,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 int parcelMax = (int)((long)LandData.Area
                               * (long)m_scene.RegionInfo.ObjectCapacity
                               / 65536L);
+>>>>>>> avn/ubitvar
                 return parcelMax;
             }
         }
@@ -243,10 +266,15 @@ namespace OpenSim.Region.CoreModules.World.Land
             else
             {
                 //Normal Calculations
+<<<<<<< HEAD
+                int simMax = (int)(((float)LandData.SimwideArea / (m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY))
+                           * (float)m_scene.RegionInfo.ObjectCapacity);
+=======
                 int simMax = (int)(   (long)LandData.SimwideArea
                                     * (long)m_scene.RegionInfo.ObjectCapacity
                                     / (long)(m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY) );
                 // m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}", LandData.SimwideArea, m_scene.RegionInfo.ObjectCapacity, simMax);
+>>>>>>> avn/ubitvar
                 return simMax;
             }
         }
@@ -261,7 +289,12 @@ namespace OpenSim.Region.CoreModules.World.Land
                 return;
 
             IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>();
-            uint regionFlags = 336723974 & ~((uint)(RegionFlags.AllowLandmark | RegionFlags.AllowSetHome));
+            // uint regionFlags = 336723974 & ~((uint)(RegionFlags.AllowLandmark | RegionFlags.AllowSetHome));
+            uint regionFlags = (uint)(RegionFlags.PublicAllowed
+                                    | RegionFlags.AllowDirectTeleport
+                                    | RegionFlags.AllowParcelChanges
+                                    | RegionFlags.AllowVoice );
+
             if (estateModule != null)
                 regionFlags = estateModule.GetRegionFlags();
 
@@ -406,6 +439,12 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 uint preserve = LandData.Flags & ~allowedDelta;
                 newData.Flags = preserve | (args.ParcelFlags & allowedDelta);
+<<<<<<< HEAD
+
+                m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
+                SendLandUpdateToAvatarsOverMe(snap_selection);
+            }
+=======
 
                 uint curdelta = LandData.Flags ^ newData.Flags;
                 curdelta &= (uint)(ParcelFlags.SoundLocal);
@@ -417,6 +456,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 return true; 
             }
             return false;
+>>>>>>> avn/ubitvar
         }
 
         public void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area)
@@ -431,9 +471,16 @@ namespace OpenSim.Region.CoreModules.World.Land
             newData.SalePrice = 0;
             newData.AuthBuyerID = UUID.Zero;
             newData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
+
+            bool sellObjects = (LandData.Flags & (uint)(ParcelFlags.SellParcelObjects)) != 0
+                && !LandData.IsGroupOwned && !groupOwned;
+            UUID previousOwner = LandData.OwnerID;
+
             m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
 //            m_scene.EventManager.TriggerParcelPrimCountUpdate();
             SendLandUpdateToAvatarsOverMe(true);
+
+            if (sellObjects) SellLandObjects(previousOwner);
         }
 
         public void DeedToGroup(UUID groupID)
@@ -759,10 +806,17 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// </summary>
         private void UpdateAABBAndAreaValues()
         {
+<<<<<<< HEAD
+            int min_x = 10000;
+            int min_y = 10000;
+            int max_x = 0;
+            int max_y = 0;
+=======
             int min_x = Int32.MaxValue;
             int min_y = Int32.MaxValue;
             int max_x = Int32.MinValue;
             int max_y = Int32.MinValue;
+>>>>>>> avn/ubitvar
             int tempArea = 0;
             int x, y;
             for (x = 0; x < LandBitmap.GetLength(0); x++)
@@ -771,6 +825,12 @@ namespace OpenSim.Region.CoreModules.World.Land
                 {
                     if (LandBitmap[x, y] == true)
                     {
+<<<<<<< HEAD
+                        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;
+=======
                         if (min_x > x)
                             min_x = x;
                         if (min_y > y)
@@ -779,6 +839,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                             max_x = x;
                         if (max_y < y)
                             max_y = y;
+>>>>>>> avn/ubitvar
                         tempArea += landUnit * landUnit; //16sqm peice of land
                     }
                 }
@@ -786,6 +847,26 @@ namespace OpenSim.Region.CoreModules.World.Land
             int tx = min_x * landUnit;
             if (tx > ((int)m_scene.RegionInfo.RegionSizeX - 1))
                 tx = ((int)m_scene.RegionInfo.RegionSizeX - 1);
+<<<<<<< HEAD
+            int ty = min_y * landUnit;
+            if (ty > ((int)m_scene.RegionInfo.RegionSizeY - 1))
+                ty = ((int)m_scene.RegionInfo.RegionSizeY - 1);
+
+            LandData.AABBMin =
+                new Vector3(
+                    (float)(min_x * landUnit), (float)(min_y * landUnit), m_scene != null ? (float)m_scene.Heightmap[tx, ty] : 0);
+
+            tx = max_x * landUnit;
+            if (tx > ((int)m_scene.RegionInfo.RegionSizeX - 1))
+                tx = ((int)m_scene.RegionInfo.RegionSizeX - 1);
+            ty = max_y * landUnit;
+            if (ty > ((int)m_scene.RegionInfo.RegionSizeY - 1))
+                ty = ((int)m_scene.RegionInfo.RegionSizeY - 1);
+
+            LandData.AABBMax 
+                = new Vector3(
+                    (float)(max_x * landUnit), (float)(max_y * landUnit), m_scene != null ? (float)m_scene.Heightmap[tx, ty] : 0);
+=======
 
             int htx;
             if (tx >= ((int)m_scene.RegionInfo.RegionSizeX))
@@ -823,6 +904,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             LandData.AABBMax 
                 = new Vector3(
                     (float)(tx), (float)(ty), m_scene != null ? (float)m_scene.Heightmap[htx, hty] : 0);
+>>>>>>> avn/ubitvar
 
             LandData.Area = tempArea;
         }
@@ -838,6 +920,10 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void SetLandBitmap(bool[,] bitmap)
         {
             LandBitmap = bitmap;
+<<<<<<< HEAD
+            // m_log.DebugFormat("{0} SetLandBitmap. BitmapSize=<{1},{2}>", LogHeader, LandBitmap.GetLength(0), LandBitmap.GetLength(1));
+=======
+>>>>>>> avn/ubitvar
             ForceUpdateLandInfo();
         }
 
@@ -863,6 +949,8 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             // Fill the bitmap square area specified by state and end
             tempBitmap = ModifyLandBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);
+            // m_log.DebugFormat("{0} GetSquareLandBitmap. tempBitmapSize=<{1},{2}>",
+            //                         LogHeader, tempBitmap.GetLength(0), tempBitmap.GetLength(1));
             return tempBitmap;
         }
 
@@ -891,6 +979,8 @@ namespace OpenSim.Region.CoreModules.World.Land
                     }
                 }
             }
+            // m_log.DebugFormat("{0} ModifyLandBitmapSquare. startXY=<{1},{2}>, endXY=<{3},{4}>, val={5}, landBitmapSize=<{6},{7}>",
+            //                         LogHeader, start_x, start_y, end_x, end_y, set_value, land_bitmap.GetLength(0), land_bitmap.GetLength(1));
             return land_bitmap;
         }
 
@@ -934,10 +1024,16 @@ namespace OpenSim.Region.CoreModules.World.Land
         private byte[] ConvertLandBitmapToBytes()
         {
             byte[] tempConvertArr = new byte[LandBitmap.GetLength(0) * LandBitmap.GetLength(1) / 8];
+<<<<<<< HEAD
+            byte tempByte = 0;
+            int byteNum = 0;
+            int i = 0;
+=======
             int tempByte = 0;
             int i, byteNum = 0;
             int mask = 1;
             i = 0;
+>>>>>>> avn/ubitvar
             for (int y = 0; y < LandBitmap.GetLength(1); y++)
             {
                 for (int x = 0; x < LandBitmap.GetLength(0); x++)
@@ -967,7 +1063,14 @@ namespace OpenSim.Region.CoreModules.World.Land
                         i = 0;
                         byteNum++;
                     }
+<<<<<<< HEAD
+                }
+            }
+            // m_log.DebugFormat("{0} ConvertLandBitmapToBytes. BitmapSize=<{1},{2}>",
+            //                         LogHeader, LandBitmap.GetLength(0), LandBitmap.GetLength(1));
+=======
  */
+>>>>>>> avn/ubitvar
             return tempConvertArr;
         }
 
@@ -1148,6 +1251,43 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         #endregion
 
+        #region Object Sales
+
+        public void SellLandObjects(UUID previousOwner)
+        {
+            // m_log.DebugFormat(
+            //    "[LAND OBJECT]: Request to sell objects in {0} from {1}", LandData.Name, previousOwner);
+
+            if (LandData.IsGroupOwned)
+                return;
+
+            IBuySellModule m_BuySellModule = m_scene.RequestModuleInterface<IBuySellModule>();
+            if (m_BuySellModule == null)
+            {
+                m_log.Error("[LAND OBJECT]: BuySellModule not found");
+                return;
+            }
+
+            ScenePresence sp;
+            if (!m_scene.TryGetScenePresence(LandData.OwnerID, out sp))
+            {
+                m_log.Error("[LAND OBJECT]: New owner is not present in scene");
+                return;
+            }
+
+            lock (primsOverMe)
+            {
+                foreach (SceneObjectGroup obj in primsOverMe)
+                {
+                    if (obj.OwnerID == previousOwner && obj.GroupID == UUID.Zero &&
+                        (obj.GetEffectivePermissions() & (uint)(OpenSim.Framework.PermissionMask.Transfer)) != 0)
+                        m_BuySellModule.BuyObject(sp.ControllingClient, UUID.Zero, obj.LocalId, 1, 0);
+                }
+            }
+        }
+
+        #endregion
+
         #region Object Returning
 
         public void ReturnObject(SceneObjectGroup obj)
@@ -1170,7 +1310,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 {
                     foreach (SceneObjectGroup obj in primsOverMe)
                     {
-                        if (obj.OwnerID == m_landData.OwnerID)
+                        if (obj.OwnerID == LandData.OwnerID)
                         {
                             if (!returns.ContainsKey(obj.OwnerID))
                                 returns[obj.OwnerID] =
@@ -1179,11 +1319,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                         }
                     }
                 }
-                else if (type == (uint)ObjectReturnType.Group && m_landData.GroupID != UUID.Zero)
+                else if (type == (uint)ObjectReturnType.Group && LandData.GroupID != UUID.Zero)
                 {
                     foreach (SceneObjectGroup obj in primsOverMe)
                     {
-                        if (obj.GroupID == m_landData.GroupID)
+                        if (obj.GroupID == LandData.GroupID)
                         {
                             if (!returns.ContainsKey(obj.OwnerID))
                                 returns[obj.OwnerID] =
@@ -1196,9 +1336,9 @@ namespace OpenSim.Region.CoreModules.World.Land
                 {
                     foreach (SceneObjectGroup obj in primsOverMe)
                     {
-                        if (obj.OwnerID != m_landData.OwnerID &&
-                            (obj.GroupID != m_landData.GroupID ||
-                            m_landData.GroupID == UUID.Zero))
+                        if (obj.OwnerID != LandData.OwnerID &&
+                            (obj.GroupID != LandData.GroupID ||
+                            LandData.GroupID == UUID.Zero))
                         {
                             if (!returns.ContainsKey(obj.OwnerID))
                                 returns[obj.OwnerID] =
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs
new file mode 100644
index 0000000..4ed67f3
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs
@@ -0,0 +1,266 @@
+/*
+ * 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 OpenSimulator 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 NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Region.CoreModules.World.Land.Tests
+{
+    public class LandManagementModuleTests : OpenSimTestCase
+    {
+        [Test]
+        public void TestAddLandObject()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+
+            LandManagementModule lmm = new LandManagementModule();
+            Scene scene = new SceneHelpers().SetupScene();            
+            SceneHelpers.SetupSceneModules(scene, lmm);             
+            
+            ILandObject lo = new LandObject(userId, false, scene);
+            lo.LandData.Name = "lo1";
+            lo.SetLandBitmap(
+                lo.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
+            lo = lmm.AddLandObject(lo);          
+
+            // TODO: Should add asserts to check that land object was added properly.
+
+            // At the moment, this test just makes sure that we can't add a land object that overlaps the areas that
+            // the first still holds.
+            ILandObject lo2 = new LandObject(userId, false, scene);
+            lo2.SetLandBitmap(
+                lo2.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
+            lo2.LandData.Name = "lo2";
+            lo2 = lmm.AddLandObject(lo2);
+
+            {
+                ILandObject loAtCoord = lmm.GetLandObject(0, 0);
+                Assert.That(loAtCoord.LandData.LocalID, Is.EqualTo(lo.LandData.LocalID));
+                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(lo.LandData.GlobalID));                          
+            }
+
+            {
+                ILandObject loAtCoord = lmm.GetLandObject((int)Constants.RegionSize - 1, ((int)Constants.RegionSize - 1));
+                Assert.That(loAtCoord.LandData.LocalID, Is.EqualTo(lo.LandData.LocalID));
+                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(lo.LandData.GlobalID));
+            }
+        }
+
+        /// <summary>
+        /// Test parcels on region when no land data exists to be loaded.
+        /// </summary>
+        [Test]
+        public void TestLoadWithNoParcels()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            SceneHelpers sh = new SceneHelpers();
+            LandManagementModule lmm = new LandManagementModule();
+            Scene scene = sh.SetupScene();            
+            SceneHelpers.SetupSceneModules(scene, lmm);   
+
+            scene.loadAllLandObjectsFromStorage(scene.RegionInfo.RegionID);
+
+            ILandObject loAtCoord1 = lmm.GetLandObject(0, 0);
+            Assert.That(loAtCoord1.LandData.LocalID, Is.Not.EqualTo(0));
+            Assert.That(loAtCoord1.LandData.GlobalID, Is.Not.EqualTo(UUID.Zero));
+
+            ILandObject loAtCoord2 = lmm.GetLandObject((int)Constants.RegionSize - 1, ((int)Constants.RegionSize - 1));
+            Assert.That(loAtCoord2.LandData.LocalID, Is.EqualTo(loAtCoord1.LandData.LocalID));
+            Assert.That(loAtCoord2.LandData.GlobalID, Is.EqualTo(loAtCoord1.LandData.GlobalID));
+        }
+
+        /// <summary>
+        /// Test parcels on region when a single parcel already exists but it does not cover the whole region.
+        /// </summary>
+        [Test]
+        public void TestLoadWithSinglePartialCoveringParcel()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+
+            SceneHelpers sh = new SceneHelpers();
+            LandManagementModule lmm = new LandManagementModule();
+            Scene scene = sh.SetupScene();            
+            SceneHelpers.SetupSceneModules(scene, lmm);   
+
+            ILandObject originalLo1 = new LandObject(userId, false, scene);
+            originalLo1.LandData.Name = "lo1";
+            originalLo1.SetLandBitmap(
+                originalLo1.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize / 2));
+
+            sh.SimDataService.StoreLandObject(originalLo1);
+
+            scene.loadAllLandObjectsFromStorage(scene.RegionInfo.RegionID);
+
+            ILandObject loAtCoord1 = lmm.GetLandObject(0, 0);
+            Assert.That(loAtCoord1.LandData.Name, Is.EqualTo(originalLo1.LandData.Name));
+            Assert.That(loAtCoord1.LandData.GlobalID, Is.EqualTo(originalLo1.LandData.GlobalID));
+
+            ILandObject loAtCoord2 = lmm.GetLandObject((int)Constants.RegionSize - 1, ((int)Constants.RegionSize - 1));
+            Assert.That(loAtCoord2.LandData.LocalID, Is.EqualTo(loAtCoord1.LandData.LocalID));
+            Assert.That(loAtCoord2.LandData.GlobalID, Is.EqualTo(loAtCoord1.LandData.GlobalID));
+        }
+
+        /// <summary>
+        /// Test parcels on region when a single parcel already exists but it does not cover the whole region.
+        /// </summary>
+        [Test]
+        public void TestLoadWithMultiplePartialCoveringParcels()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+
+            SceneHelpers sh = new SceneHelpers();
+            LandManagementModule lmm = new LandManagementModule();
+            Scene scene = sh.SetupScene();            
+            SceneHelpers.SetupSceneModules(scene, lmm);   
+
+            ILandObject originalLo1 = new LandObject(userId, false, scene);
+            originalLo1.LandData.Name = "lo1";
+            originalLo1.SetLandBitmap(
+                originalLo1.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize / 2));
+
+            sh.SimDataService.StoreLandObject(originalLo1);
+
+            ILandObject originalLo2 = new LandObject(userId, false, scene);
+            originalLo2.LandData.Name = "lo2";
+            originalLo2.SetLandBitmap(
+                originalLo2.GetSquareLandBitmap(
+                0, (int)Constants.RegionSize / 2, (int)Constants.RegionSize, ((int)Constants.RegionSize / 4) * 3));
+
+            sh.SimDataService.StoreLandObject(originalLo2);
+
+            scene.loadAllLandObjectsFromStorage(scene.RegionInfo.RegionID);
+
+            ILandObject loAtCoord1 = lmm.GetLandObject(0, 0);
+            Assert.That(loAtCoord1.LandData.Name, Is.EqualTo(originalLo1.LandData.Name));
+            Assert.That(loAtCoord1.LandData.GlobalID, Is.EqualTo(originalLo1.LandData.GlobalID));
+
+            ILandObject loAtCoord2 
+                = lmm.GetLandObject((int)Constants.RegionSize - 1, (((int)Constants.RegionSize / 4) * 3) - 1);
+            Assert.That(loAtCoord2.LandData.Name, Is.EqualTo(originalLo2.LandData.Name));
+            Assert.That(loAtCoord2.LandData.GlobalID, Is.EqualTo(originalLo2.LandData.GlobalID));
+
+            ILandObject loAtCoord3 = lmm.GetLandObject((int)Constants.RegionSize - 1, ((int)Constants.RegionSize - 1));
+            Assert.That(loAtCoord3.LandData.LocalID, Is.Not.EqualTo(loAtCoord1.LandData.LocalID));
+            Assert.That(loAtCoord3.LandData.LocalID, Is.Not.EqualTo(loAtCoord2.LandData.LocalID));
+            Assert.That(loAtCoord3.LandData.GlobalID, Is.Not.EqualTo(loAtCoord1.LandData.GlobalID));
+            Assert.That(loAtCoord3.LandData.GlobalID, Is.Not.EqualTo(loAtCoord2.LandData.GlobalID));
+        }
+
+        /// <summary>
+        /// Test parcels on region when whole region is parcelled (which should normally always be the case).
+        /// </summary>
+        [Test]
+        public void TestLoad()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+
+            SceneHelpers sh = new SceneHelpers();
+            LandManagementModule lmm = new LandManagementModule();
+            Scene scene = sh.SetupScene();            
+            SceneHelpers.SetupSceneModules(scene, lmm);   
+
+            ILandObject originalLo1 = new LandObject(userId, false, scene);
+            originalLo1.LandData.Name = "lo1";
+            originalLo1.SetLandBitmap(
+                originalLo1.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize / 2));
+
+            sh.SimDataService.StoreLandObject(originalLo1);
+
+            ILandObject originalLo2 = new LandObject(userId, false, scene);
+            originalLo2.LandData.Name = "lo2";
+            originalLo2.SetLandBitmap(
+                originalLo2.GetSquareLandBitmap(0, (int)Constants.RegionSize / 2, (int)Constants.RegionSize, (int)Constants.RegionSize));
+
+            sh.SimDataService.StoreLandObject(originalLo2);
+
+            scene.loadAllLandObjectsFromStorage(scene.RegionInfo.RegionID);
+
+            {
+                ILandObject loAtCoord = lmm.GetLandObject(0, 0);
+                Assert.That(loAtCoord.LandData.Name, Is.EqualTo(originalLo1.LandData.Name));
+                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(originalLo1.LandData.GlobalID));                          
+            }
+
+            {
+                ILandObject loAtCoord = lmm.GetLandObject((int)Constants.RegionSize - 1, ((int)Constants.RegionSize - 1));
+                Assert.That(loAtCoord.LandData.Name, Is.EqualTo(originalLo2.LandData.Name));
+                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(originalLo2.LandData.GlobalID));
+            }
+        }
+
+        [Test]
+        public void TestSubdivide()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+
+            LandManagementModule lmm = new LandManagementModule();
+            Scene scene = new SceneHelpers().SetupScene();            
+            SceneHelpers.SetupSceneModules(scene, lmm);             
+            
+            ILandObject lo = new LandObject(userId, false, scene);
+            lo.LandData.Name = "lo1";
+            lo.SetLandBitmap(
+                lo.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
+            lo = lmm.AddLandObject(lo);          
+
+            lmm.Subdivide(0, 0, LandManagementModule.LandUnit, LandManagementModule.LandUnit, userId);
+
+            {
+                ILandObject loAtCoord = lmm.GetLandObject(0, 0);
+                Assert.That(loAtCoord.LandData.LocalID, Is.Not.EqualTo(lo.LandData.LocalID));
+                Assert.That(loAtCoord.LandData.GlobalID, Is.Not.EqualTo(lo.LandData.GlobalID));                          
+            }
+
+            {
+                ILandObject loAtCoord = lmm.GetLandObject(LandManagementModule.LandUnit, LandManagementModule.LandUnit);
+                Assert.That(loAtCoord.LandData.LocalID, Is.EqualTo(lo.LandData.LocalID));
+                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(lo.LandData.GlobalID));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
index 0945b43..949acb6 100644
--- a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
+++ b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
@@ -36,7 +36,6 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.World.Land.Tests
 {