diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Tests/Common/Mock/TestLandChannel.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Tests/Common/Mock/TestLandChannel.cs')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestLandChannel.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs index 89ebcd5..05db03fe 100644 --- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs +++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs | |||
@@ -65,7 +65,7 @@ namespace OpenSim.Tests.Common | |||
65 | { | 65 | { |
66 | return m_parcels; | 66 | return m_parcels; |
67 | } | 67 | } |
68 | 68 | ||
69 | public void Clear(bool setupDefaultParcel) | 69 | public void Clear(bool setupDefaultParcel) |
70 | { | 70 | { |
71 | m_parcels.Clear(); | 71 | m_parcels.Clear(); |
@@ -96,6 +96,11 @@ namespace OpenSim.Tests.Common | |||
96 | return GetNoLand(); | 96 | return GetNoLand(); |
97 | } | 97 | } |
98 | 98 | ||
99 | public ILandObject GetLandObject(UUID ID) | ||
100 | { | ||
101 | return GetNoLand(); | ||
102 | } | ||
103 | |||
99 | public ILandObject GetLandObject(float x, float y) | 104 | public ILandObject GetLandObject(float x, float y) |
100 | { | 105 | { |
101 | return GetNoLand(); | 106 | return GetNoLand(); |
@@ -104,6 +109,7 @@ namespace OpenSim.Tests.Common | |||
104 | public bool IsLandPrimCountTainted() { return false; } | 109 | public bool IsLandPrimCountTainted() { return false; } |
105 | public bool IsForcefulBansAllowed() { return false; } | 110 | public bool IsForcefulBansAllowed() { return false; } |
106 | public void UpdateLandObject(int localID, LandData data) {} | 111 | public void UpdateLandObject(int localID, LandData data) {} |
112 | public void SendParcelsOverlay(IClientAPI client) {} | ||
107 | public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient) {} | 113 | public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient) {} |
108 | public void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel) {} | 114 | public void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel) {} |
109 | public void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel) {} | 115 | public void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel) {} |
@@ -111,5 +117,6 @@ namespace OpenSim.Tests.Common | |||
111 | 117 | ||
112 | public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {} | 118 | public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {} |
113 | public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {} | 119 | public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {} |
120 | public void sendClientInitialLandInfo(IClientAPI remoteClient) { } | ||
114 | } | 121 | } |
115 | } \ No newline at end of file | 122 | } \ No newline at end of file |