aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/TerrainData.cs
diff options
context:
space:
mode:
authorRobert Adams2013-11-10 19:52:31 -0800
committerRobert Adams2013-11-10 19:52:31 -0800
commitc12e68e34d6f9340bbd17a2f183fe9859483cc6f (patch)
tree8fa99677885eb8dde5e352953dbbbb9fbbd2b2c6 /OpenSim/Framework/TerrainData.cs
parentMerge branch 'master' into varregion (diff)
downloadopensim-SC_OLD-c12e68e34d6f9340bbd17a2f183fe9859483cc6f.zip
opensim-SC_OLD-c12e68e34d6f9340bbd17a2f183fe9859483cc6f.tar.gz
opensim-SC_OLD-c12e68e34d6f9340bbd17a2f183fe9859483cc6f.tar.bz2
opensim-SC_OLD-c12e68e34d6f9340bbd17a2f183fe9859483cc6f.tar.xz
varregion: fix GetLandObject error return and initialization of square
land object bitmaps. This fixes creation of child presences and the editing of parcels. Also lots of commented out debugging messages.
Diffstat (limited to 'OpenSim/Framework/TerrainData.cs')
-rw-r--r--OpenSim/Framework/TerrainData.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Framework/TerrainData.cs b/OpenSim/Framework/TerrainData.cs
index 75446d1..1c52a69 100644
--- a/OpenSim/Framework/TerrainData.cs
+++ b/OpenSim/Framework/TerrainData.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Framework
112 public class HeightmapTerrainData : TerrainData 112 public class HeightmapTerrainData : TerrainData
113 { 113 {
114 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 114 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
115 private static string LogHeader = "[TERRAIN DATA]"; 115 private static string LogHeader = "[HEIGHTMAP TERRAIN DATA]";
116 116
117 // TerrainData.this[x, y] 117 // TerrainData.this[x, y]
118 public override float this[int x, int y] 118 public override float this[int x, int y]
@@ -124,7 +124,6 @@ namespace OpenSim.Framework
124 { 124 {
125 m_heightmap[x, y] = newVal; 125 m_heightmap[x, y] = newVal;
126 m_taint[x / Constants.TerrainPatchSize, y / Constants.TerrainPatchSize] = true; 126 m_taint[x / Constants.TerrainPatchSize, y / Constants.TerrainPatchSize] = true;
127 // m_log.DebugFormat("{0} set[{1},{2}] to {3} ({4})", LogHeader, x, y, value, newVal);
128 } 127 }
129 } 128 }
130 } 129 }
@@ -258,6 +257,7 @@ namespace OpenSim.Framework
258 257
259 } 258 }
260 } 259 }
260 // m_log.DebugFormat("{0} new by doubles. sizeX={1}, sizeY={2}, sizeZ={3}", LogHeader, SizeX, SizeY, SizeZ);
261 261
262 m_taint = new bool[SizeX / Constants.TerrainPatchSize, SizeY / Constants.TerrainPatchSize]; 262 m_taint = new bool[SizeX / Constants.TerrainPatchSize, SizeY / Constants.TerrainPatchSize];
263 ClearTaint(); 263 ClearTaint();
@@ -272,6 +272,7 @@ namespace OpenSim.Framework
272 m_compressionFactor = 100.0f; 272 m_compressionFactor = 100.0f;
273 m_heightmap = new short[SizeX, SizeY]; 273 m_heightmap = new short[SizeX, SizeY];
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 ClearTaint(); 276 ClearTaint();
276 } 277 }
277 278
@@ -282,6 +283,7 @@ namespace OpenSim.Framework
282 for (int xx = 0; xx < SizeX; xx++) 283 for (int xx = 0; xx < SizeX; xx++)
283 for (int yy = 0; yy < SizeY; yy++) 284 for (int yy = 0; yy < SizeY; yy++)
284 m_heightmap[xx, yy] = cmap[ind++]; 285 m_heightmap[xx, yy] = cmap[ind++];
286 // m_log.DebugFormat("{0} new by compressed map. sizeX={1}, sizeY={2}, sizeZ={3}", LogHeader, SizeX, SizeY, SizeZ);
285 } 287 }
286 288
287 // Create a heighmap from a database blob 289 // Create a heighmap from a database blob