aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests
diff options
context:
space:
mode:
authorOren Hurvitz2011-05-12 14:42:28 +0300
committerJustin Clark-Casey (justincc)2011-05-14 03:12:31 +0100
commit9780d1775b25973d974c755bba5e68abfef58cb1 (patch)
tree7d9180c199b98290b4f355828448e9eca89d4aef /OpenSim/Tests
parentThe get_grid_info REST call now encodes XML Entities (diff)
downloadopensim-SC_OLD-9780d1775b25973d974c755bba5e68abfef58cb1.zip
opensim-SC_OLD-9780d1775b25973d974c755bba5e68abfef58cb1.tar.gz
opensim-SC_OLD-9780d1775b25973d974c755bba5e68abfef58cb1.tar.bz2
opensim-SC_OLD-9780d1775b25973d974c755bba5e68abfef58cb1.tar.xz
When loading an OAR that doesn't have parcels, create a default parcel
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r--OpenSim/Tests/Common/Mock/TestLandChannel.cs13
1 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
index c3134b3..0e4dfb9 100644
--- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs
+++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
@@ -40,10 +40,12 @@ namespace OpenSim.Tests.Common.Mock
40 public class TestLandChannel : ILandChannel 40 public class TestLandChannel : ILandChannel
41 { 41 {
42 private Scene m_scene; 42 private Scene m_scene;
43 private List<ILandObject> m_parcels;
43 44
44 public TestLandChannel(Scene scene) 45 public TestLandChannel(Scene scene)
45 { 46 {
46 m_scene = scene; 47 m_scene = scene;
48 m_parcels = new List<ILandObject>();
47 } 49 }
48 50
49 public List<ILandObject> ParcelsNearPoint(Vector3 position) 51 public List<ILandObject> ParcelsNearPoint(Vector3 position)
@@ -53,12 +55,19 @@ namespace OpenSim.Tests.Common.Mock
53 55
54 public List<ILandObject> AllParcels() 56 public List<ILandObject> AllParcels()
55 { 57 {
56 return new List<ILandObject>(); 58 return m_parcels;
57 } 59 }
58 60
59 public void Clear(bool setupDefaultParcel) 61 public void Clear(bool setupDefaultParcel)
60 { 62 {
61 // Intentionally blank since we don't save any parcel data in the test channel 63 m_parcels.Clear();
64
65 if (setupDefaultParcel)
66 {
67 ILandObject obj = new LandObject(UUID.Zero, false, m_scene);
68 obj.LandData.Name = "Your Parcel";
69 m_parcels.Add(obj);
70 }
62 } 71 }
63 72
64 protected ILandObject GetNoLand() 73 protected ILandObject GetNoLand()