diff options
author | UbitUmarov | 2015-08-19 08:48:50 +0100 |
---|---|---|
committer | UbitUmarov | 2015-08-19 08:48:50 +0100 |
commit | 0b105da626ae8c2fb519a817b827f90534ed7d08 (patch) | |
tree | 509e6d091fb12f38fd09528335e51aeedbe59c08 /OpenSim/Tests/Common/Mock | |
parent | Merge branch 'master' into ubitworkmaster (diff) | |
parent | varregion: update MapImageServiceModule to upload multiple map tiles for larg... (diff) | |
download | opensim-SC_OLD-0b105da626ae8c2fb519a817b827f90534ed7d08.zip opensim-SC_OLD-0b105da626ae8c2fb519a817b827f90534ed7d08.tar.gz opensim-SC_OLD-0b105da626ae8c2fb519a817b827f90534ed7d08.tar.bz2 opensim-SC_OLD-0b105da626ae8c2fb519a817b827f90534ed7d08.tar.xz |
Merge branch 'mbworkvar2' into ubitvar
Diffstat (limited to 'OpenSim/Tests/Common/Mock')
-rw-r--r-- | OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs index 5c1ec0b..3ab9020 100644 --- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs | |||
@@ -69,11 +69,21 @@ namespace OpenSim.Data.Null | |||
69 | m_store.StoreTerrain(terrain, regionID); | 69 | m_store.StoreTerrain(terrain, regionID); |
70 | } | 70 | } |
71 | 71 | ||
72 | public void StoreTerrain(TerrainData terrain, UUID regionID) | ||
73 | { | ||
74 | m_store.StoreTerrain(terrain, regionID); | ||
75 | } | ||
76 | |||
72 | public double[,] LoadTerrain(UUID regionID) | 77 | public double[,] LoadTerrain(UUID regionID) |
73 | { | 78 | { |
74 | return m_store.LoadTerrain(regionID); | 79 | return m_store.LoadTerrain(regionID); |
75 | } | 80 | } |
76 | 81 | ||
82 | public TerrainData LoadTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ) | ||
83 | { | ||
84 | return m_store.LoadTerrain(regionID, pSizeX, pSizeY, pSizeZ); | ||
85 | } | ||
86 | |||
77 | public void StoreLandObject(ILandObject Parcel) | 87 | public void StoreLandObject(ILandObject Parcel) |
78 | { | 88 | { |
79 | m_store.StoreLandObject(Parcel); | 89 | m_store.StoreLandObject(Parcel); |
@@ -159,7 +169,7 @@ namespace OpenSim.Data.Null | |||
159 | protected Dictionary<UUID, SceneObjectPart> m_sceneObjectParts = new Dictionary<UUID, SceneObjectPart>(); | 169 | protected Dictionary<UUID, SceneObjectPart> m_sceneObjectParts = new Dictionary<UUID, SceneObjectPart>(); |
160 | protected Dictionary<UUID, ICollection<TaskInventoryItem>> m_primItems | 170 | protected Dictionary<UUID, ICollection<TaskInventoryItem>> m_primItems |
161 | = new Dictionary<UUID, ICollection<TaskInventoryItem>>(); | 171 | = new Dictionary<UUID, ICollection<TaskInventoryItem>>(); |
162 | protected Dictionary<UUID, double[,]> m_terrains = new Dictionary<UUID, double[,]>(); | 172 | protected Dictionary<UUID, TerrainData> m_terrains = new Dictionary<UUID, TerrainData>(); |
163 | protected Dictionary<UUID, LandData> m_landData = new Dictionary<UUID, LandData>(); | 173 | protected Dictionary<UUID, LandData> m_landData = new Dictionary<UUID, LandData>(); |
164 | 174 | ||
165 | public void Initialise(string dbfile) | 175 | public void Initialise(string dbfile) |
@@ -304,12 +314,17 @@ namespace OpenSim.Data.Null | |||
304 | return new List<SceneObjectGroup>(objects.Values); | 314 | return new List<SceneObjectGroup>(objects.Values); |
305 | } | 315 | } |
306 | 316 | ||
307 | public void StoreTerrain(double[,] ter, UUID regionID) | 317 | public void StoreTerrain(TerrainData ter, UUID regionID) |
308 | { | 318 | { |
309 | m_terrains[regionID] = ter; | 319 | m_terrains[regionID] = ter; |
310 | } | 320 | } |
311 | 321 | ||
312 | public double[,] LoadTerrain(UUID regionID) | 322 | public void StoreTerrain(double[,] ter, UUID regionID) |
323 | { | ||
324 | m_terrains[regionID] = new HeightmapTerrainData(ter); | ||
325 | } | ||
326 | |||
327 | public TerrainData LoadTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ) | ||
313 | { | 328 | { |
314 | if (m_terrains.ContainsKey(regionID)) | 329 | if (m_terrains.ContainsKey(regionID)) |
315 | return m_terrains[regionID]; | 330 | return m_terrains[regionID]; |
@@ -317,6 +332,14 @@ namespace OpenSim.Data.Null | |||
317 | return null; | 332 | return null; |
318 | } | 333 | } |
319 | 334 | ||
335 | public double[,] LoadTerrain(UUID regionID) | ||
336 | { | ||
337 | if (m_terrains.ContainsKey(regionID)) | ||
338 | return m_terrains[regionID].GetDoubles(); | ||
339 | else | ||
340 | return null; | ||
341 | } | ||
342 | |||
320 | public void RemoveLandObject(UUID globalID) | 343 | public void RemoveLandObject(UUID globalID) |
321 | { | 344 | { |
322 | if (m_landData.ContainsKey(globalID)) | 345 | if (m_landData.ContainsKey(globalID)) |