From 5a26dc2743f176cc5f5fad0ae93aa8187a399f13 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 27 Jan 2011 18:48:48 +0000
Subject: Fix OAR parcel loading so that old parcels are replaced by the new
 instead of merged.

The --merge switch will still merge the old and new land parcelling.
---
 OpenSim/Region/CoreModules/World/Land/LandChannel.cs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'OpenSim/Region/CoreModules/World/Land/LandChannel.cs')

diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
index 9e27ef0..2959eb4 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
@@ -116,6 +116,12 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             return new List<ILandObject>();
         }
+        
+        public void Clear()
+        {
+            if (m_landManagementModule != null)
+                m_landManagementModule.Clear();
+        }
 
         public List<ILandObject> ParcelsNearPoint(Vector3 position)
         {
-- 
cgit v1.1


From be3685b1a2ef8ebab25739fc5a5d632ed7359728 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 27 Jan 2011 20:29:06 +0000
Subject: When an oar is loaded, do not create a default parcel before loading
 the parcels from the OAR.

The region spanning parcel shouldn't exist in this situation.  If it does, when the land data is loaded it is repersisted with a local ID which comes after the ones loaded via the oar, which obliterates the oar loaded one.

Resaving the data we just loaded from the database is somewhat odd in itself (though this makes sense from the way that OAR loading was already using the same event).
---
 OpenSim/Region/CoreModules/World/Land/LandChannel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules/World/Land/LandChannel.cs')

diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
index 2959eb4..7d990c2 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
@@ -117,10 +117,10 @@ namespace OpenSim.Region.CoreModules.World.Land
             return new List<ILandObject>();
         }
         
-        public void Clear()
+        public void Clear(bool setupDefaultParcel)
         {
             if (m_landManagementModule != null)
-                m_landManagementModule.Clear();
+                m_landManagementModule.Clear(setupDefaultParcel);
         }
 
         public List<ILandObject> ParcelsNearPoint(Vector3 position)
-- 
cgit v1.1