aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorRobert Adams2014-02-03 21:21:29 -0800
committerRobert Adams2014-02-03 21:23:32 -0800
commit1b41ec0a85443b08b9ea8a33215deb9243cd7156 (patch)
tree4f48c95019cf10b59daca9d6e87297807000adc5 /OpenSim/Region/Framework/Scenes
parentAdd one check for a blank URL because the module wasn't quite sure not to wor... (diff)
downloadopensim-SC_OLD-1b41ec0a85443b08b9ea8a33215deb9243cd7156.zip
opensim-SC_OLD-1b41ec0a85443b08b9ea8a33215deb9243cd7156.tar.gz
opensim-SC_OLD-1b41ec0a85443b08b9ea8a33215deb9243cd7156.tar.bz2
opensim-SC_OLD-1b41ec0a85443b08b9ea8a33215deb9243cd7156.tar.xz
Fix raw32 terrain heightmap reader so it estimates terrain size from
the size of the input stream. This is required since the raw heightmap format (.r32) does not contain any size information. The estimation relies on terrain being square.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/TerrainChannel.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
index 24709dc..60dc6c9 100644
--- a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
@@ -217,6 +217,10 @@ namespace OpenSim.Region.Framework.Scenes
217 // ITerrainChannel.Merge 217 // ITerrainChannel.Merge
218 public void Merge(ITerrainChannel newTerrain, Vector3 displacement, float radianRotation, Vector2 rotationDisplacement) 218 public void Merge(ITerrainChannel newTerrain, Vector3 displacement, float radianRotation, Vector2 rotationDisplacement)
219 { 219 {
220 m_log.DebugFormat("{0} Merge. inSize=<{1},{2}>, disp={3}, rot={4}, rotDisp={5}, outSize=<{6},{7}>", LogHeader,
221 newTerrain.Width, newTerrain.Height,
222 displacement, radianRotation, rotationDisplacement,
223 m_terrainData.SizeX, m_terrainData.SizeY);
220 for (int xx = 0; xx < newTerrain.Width; xx++) 224 for (int xx = 0; xx < newTerrain.Width; xx++)
221 { 225 {
222 for (int yy = 0; yy < newTerrain.Height; yy++) 226 for (int yy = 0; yy < newTerrain.Height; yy++)