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/Tests/Common/Mock/TestLandChannel.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenSim/Tests')

diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
index 159764c..366af67 100644
--- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs
+++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
@@ -55,6 +55,11 @@ namespace OpenSim.Tests.Common.Mock
         {
             return new List<ILandObject>();
         }
+        
+        public void Clear()
+        {
+            // Intentionally blank since we don't save any parcel data in the test channel
+        }
 
         protected ILandObject GetNoLand()
         {
-- 
cgit v1.1