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/RegionCombinerModule/RegionCombinerLargeLandChannel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs')

diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
index c2480b7..98e5453 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
@@ -63,9 +63,9 @@ public class RegionCombinerLargeLandChannel : ILandChannel
             return RootRegionLandChannel.AllParcels();
         }
         
-        public void Clear()
+        public void Clear(bool setupDefaultParcel)
         {
-            RootRegionLandChannel.Clear();
+            RootRegionLandChannel.Clear(setupDefaultParcel);
         }
 
         public ILandObject GetLandObject(int x, int y)
-- 
cgit v1.1