aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorRobert Adams2013-11-01 16:37:27 -0700
committerRobert Adams2013-11-01 16:37:27 -0700
commit92c06a5d0b9285789954b94f44e7c9a594762a44 (patch)
treeb40129d67828f7a83159dc87f9bfdee05d5949d7 /OpenSim
parentvarregion: enforce multiple of 256 for region size when parameters fetched fr... (diff)
downloadopensim-SC_OLD-92c06a5d0b9285789954b94f44e7c9a594762a44.zip
opensim-SC_OLD-92c06a5d0b9285789954b94f44e7c9a594762a44.tar.gz
opensim-SC_OLD-92c06a5d0b9285789954b94f44e7c9a594762a44.tar.bz2
opensim-SC_OLD-92c06a5d0b9285789954b94f44e7c9a594762a44.tar.xz
varregion: fix lawn-mower terrain fill so it works for non-square regions.
Add some debugging logs on region creation to report region size.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/TerrainData.cs4
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/TerrainData.cs b/OpenSim/Framework/TerrainData.cs
index 58b203f..9c036ca 100644
--- a/OpenSim/Framework/TerrainData.cs
+++ b/OpenSim/Framework/TerrainData.cs
@@ -280,9 +280,11 @@ namespace OpenSim.Framework
280 { 280 {
281 case DBTerrainRevision.Compressed2D: 281 case DBTerrainRevision.Compressed2D:
282 FromCompressedTerrainSerialization(pBlob); 282 FromCompressedTerrainSerialization(pBlob);
283 m_log.DebugFormat("{0} HeightmapTerrainData create from Compressed2D serialization. Size=<{1},{2}>", LogHeader, SizeX, SizeY);
283 break; 284 break;
284 default: 285 default:
285 FromLegacyTerrainSerialization(pBlob); 286 FromLegacyTerrainSerialization(pBlob);
287 m_log.DebugFormat("{0} HeightmapTerrainData create from legacy serialization. Size=<{1},{2}>", LogHeader, SizeX, SizeY);
286 break; 288 break;
287 } 289 }
288 } 290 }
@@ -333,8 +335,6 @@ namespace OpenSim.Framework
333 } 335 }
334 } 336 }
335 ClearTaint(); 337 ClearTaint();
336
337 m_log.InfoFormat("{0} Loaded legacy heightmap. SizeX={1}, SizeY={2}", LogHeader, SizeX, SizeY);
338 } 338 }
339 } 339 }
340 340
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index c8e7eb5..d2fa837 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1195,7 +1195,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1195 for (int j = y1 + 1; j <= y2; j++) 1195 for (int j = y1 + 1; j <= y2; j++)
1196 SendLayerData(x2, j, map); 1196 SendLayerData(x2, j, map);
1197 1197
1198 if (x2 - x1 > 0) 1198 if (x2 - x1 > 0 && y2 - y1 > 0)
1199 SendLayerBottomLeft(map, x1, y1 + 1, x2 - 1, y2); 1199 SendLayerBottomLeft(map, x1, y1 + 1, x2 - 1, y2);
1200 } 1200 }
1201 1201
@@ -1209,7 +1209,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1209 for (int j = y2 - 1; j >= y1; j--) 1209 for (int j = y2 - 1; j >= y1; j--)
1210 SendLayerData(x1, j, map); 1210 SendLayerData(x1, j, map);
1211 1211
1212 if (x2 - x1 > 0) 1212 if (x2 - x1 > 0 && y2 - y1 > 0)
1213 SendLayerTopRight(map, x1 + 1, y1, x2, y2 - 1); 1213 SendLayerTopRight(map, x1 + 1, y1, x2, y2 - 1);
1214 } 1214 }
1215 1215