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/Framework/Interfaces/ILandChannel.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
index 20b8ab6..17570c6 100644
--- a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
+++ b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
@@ -69,6 +69,11 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <returns></returns>
         ILandObject GetLandObject(int localID);
         
+        /// <summary>
+        /// Clear the land channel of all parcels.
+        /// </summary>
+        void Clear();
+        
         bool IsLandPrimCountTainted();
         bool IsForcefulBansAllowed();
         void UpdateLandObject(int localID, LandData data);
-- 
cgit v1.1