diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/TerrainData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 4 |
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 | ||