diff options
| author | Melanie | 2011-01-27 20:54:02 +0000 |
|---|---|---|
| committer | Melanie | 2011-01-27 20:54:02 +0000 |
| commit | 34358165418530cacc2e819dddf1a55c73acf446 (patch) | |
| tree | eee27e3789e1281ba9911c25d18e940f8805963e /OpenSim/Tests/Common | |
| parent | Make the estate setting "Allow direct teleport" override the constraint (diff) | |
| parent | When an oar is loaded, do not create a default parcel before loading the parc... (diff) | |
| download | opensim-SC-34358165418530cacc2e819dddf1a55c73acf446.zip opensim-SC-34358165418530cacc2e819dddf1a55c73acf446.tar.gz opensim-SC-34358165418530cacc2e819dddf1a55c73acf446.tar.bz2 opensim-SC-34358165418530cacc2e819dddf1a55c73acf446.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -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..c3134b3 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(bool setupDefaultParcel) | ||
| 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 | { |