aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorRobert Adams2014-01-28 15:58:45 -0800
committerRobert Adams2014-01-28 15:58:45 -0800
commitd25265ae82a3ac3afc32f65f820c9ed0b2bff31f (patch)
treead74faca895e7bd43cd29f0de4cf7888fa8b6c45 /OpenSim/Framework
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-d25265ae82a3ac3afc32f65f820c9ed0b2bff31f.zip
opensim-SC_OLD-d25265ae82a3ac3afc32f65f820c9ed0b2bff31f.tar.gz
opensim-SC_OLD-d25265ae82a3ac3afc32f65f820c9ed0b2bff31f.tar.bz2
opensim-SC_OLD-d25265ae82a3ac3afc32f65f820c9ed0b2bff31f.tar.xz
Fix terrain tests by properly initializing low detail terrain to zero height.
Also remove PI heightmap test as new heightmaps only have two significant digits.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/TerrainData.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/TerrainData.cs b/OpenSim/Framework/TerrainData.cs
index 1c52a69..d1e0e7e 100644
--- a/OpenSim/Framework/TerrainData.cs
+++ b/OpenSim/Framework/TerrainData.cs
@@ -274,6 +274,7 @@ namespace OpenSim.Framework
274 m_taint = new bool[SizeX / Constants.TerrainPatchSize, SizeY / Constants.TerrainPatchSize]; 274 m_taint = new bool[SizeX / Constants.TerrainPatchSize, SizeY / Constants.TerrainPatchSize];
275 // m_log.DebugFormat("{0} new by dimensions. sizeX={1}, sizeY={2}, sizeZ={3}", LogHeader, SizeX, SizeY, SizeZ); 275 // m_log.DebugFormat("{0} new by dimensions. sizeX={1}, sizeY={2}, sizeZ={3}", LogHeader, SizeX, SizeY, SizeZ);
276 ClearTaint(); 276 ClearTaint();
277 ClearLand(0f);
277 } 278 }
278 279
279 public HeightmapTerrainData(short[] cmap, float pCompressionFactor, int pX, int pY, int pZ) : this(pX, pY, pZ) 280 public HeightmapTerrainData(short[] cmap, float pCompressionFactor, int pX, int pY, int pZ) : this(pX, pY, pZ)