diff options
| author | Diva Canto | 2012-04-27 09:26:14 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-04-27 09:26:14 -0700 |
| commit | 2970a18e54bc4811af67a2f0c307fb79c00c9a18 (patch) | |
| tree | e4faab8dd2b55edff0632faf241c960ad553ccbc /OpenSim/Tests/Common/Mock/TestLandChannel.cs | |
| parent | Minor change in error message (HG teleport failures) (diff) | |
| parent | Add regression test for teleporting an agent between separated regions on the... (diff) | |
| download | opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.zip opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.gz opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.bz2 opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Tests/Common/Mock/TestLandChannel.cs')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestLandChannel.cs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs index 0e4dfb9..4b4d52d 100644 --- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs +++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs | |||
| @@ -46,6 +46,14 @@ namespace OpenSim.Tests.Common.Mock | |||
| 46 | { | 46 | { |
| 47 | m_scene = scene; | 47 | m_scene = scene; |
| 48 | m_parcels = new List<ILandObject>(); | 48 | m_parcels = new List<ILandObject>(); |
| 49 | SetupDefaultParcel(); | ||
| 50 | } | ||
| 51 | |||
| 52 | private void SetupDefaultParcel() | ||
| 53 | { | ||
| 54 | ILandObject obj = new LandObject(UUID.Zero, false, m_scene); | ||
| 55 | obj.LandData.Name = "Your Parcel"; | ||
| 56 | m_parcels.Add(obj); | ||
| 49 | } | 57 | } |
| 50 | 58 | ||
| 51 | public List<ILandObject> ParcelsNearPoint(Vector3 position) | 59 | public List<ILandObject> ParcelsNearPoint(Vector3 position) |
| @@ -63,11 +71,7 @@ namespace OpenSim.Tests.Common.Mock | |||
| 63 | m_parcels.Clear(); | 71 | m_parcels.Clear(); |
| 64 | 72 | ||
| 65 | if (setupDefaultParcel) | 73 | if (setupDefaultParcel) |
| 66 | { | 74 | SetupDefaultParcel(); |
| 67 | ILandObject obj = new LandObject(UUID.Zero, false, m_scene); | ||
| 68 | obj.LandData.Name = "Your Parcel"; | ||
| 69 | m_parcels.Add(obj); | ||
| 70 | } | ||
| 71 | } | 75 | } |
| 72 | 76 | ||
| 73 | protected ILandObject GetNoLand() | 77 | protected ILandObject GetNoLand() |
| @@ -102,6 +106,5 @@ namespace OpenSim.Tests.Common.Mock | |||
| 102 | 106 | ||
| 103 | public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {} | 107 | public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {} |
| 104 | public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {} | 108 | public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {} |
| 105 | |||
| 106 | } | 109 | } |
| 107 | } | 110 | } \ No newline at end of file |