diff options
author | Justin Clark-Casey (justincc) | 2011-01-27 18:48:48 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-01-27 18:48:48 +0000 |
commit | 5a26dc2743f176cc5f5fad0ae93aa8187a399f13 (patch) | |
tree | e48f513ed8ee8271c92930adbbeaf6c7fbd01798 /OpenSim/Tests/Common/Mock | |
parent | remove unused CreateBaseLand() (diff) | |
download | opensim-SC_OLD-5a26dc2743f176cc5f5fad0ae93aa8187a399f13.zip opensim-SC_OLD-5a26dc2743f176cc5f5fad0ae93aa8187a399f13.tar.gz opensim-SC_OLD-5a26dc2743f176cc5f5fad0ae93aa8187a399f13.tar.bz2 opensim-SC_OLD-5a26dc2743f176cc5f5fad0ae93aa8187a399f13.tar.xz |
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.
Diffstat (limited to 'OpenSim/Tests/Common/Mock')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestLandChannel.cs | 5 |
1 files changed, 5 insertions, 0 deletions
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 | |||
55 | { | 55 | { |
56 | return new List<ILandObject>(); | 56 | return new List<ILandObject>(); |
57 | } | 57 | } |
58 | |||
59 | public void Clear() | ||
60 | { | ||
61 | // Intentionally blank since we don't save any parcel data in the test channel | ||
62 | } | ||
58 | 63 | ||
59 | protected ILandObject GetNoLand() | 64 | protected ILandObject GetNoLand() |
60 | { | 65 | { |