OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

varregion: fix lawn-mower terrain fill so it works for non-square regions. 

Add some debugging logs on region creation to report region size.
varregion
Robert Adams 2013-11-01 16:37:27 -07:00
parent 976530569a
commit 92c06a5d0b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/TerrainData.cs
View File

@ -280,9 +280,11 @@ namespace OpenSim.Framework
{ {
case DBTerrainRevision.Compressed2D: case DBTerrainRevision.Compressed2D:
FromCompressedTerrainSerialization(pBlob); FromCompressedTerrainSerialization(pBlob);
m_log.DebugFormat("{0} HeightmapTerrainData create from Compressed2D serialization. Size=<{1},{2}>", LogHeader, SizeX, SizeY);
break; break;
default: default:
FromLegacyTerrainSerialization(pBlob); FromLegacyTerrainSerialization(pBlob);
m_log.DebugFormat("{0} HeightmapTerrainData create from legacy serialization. Size=<{1},{2}>", LogHeader, SizeX, SizeY);
break; break;
} }
} }
@ -333,8 +335,6 @@ namespace OpenSim.Framework
} }
} }
ClearTaint(); ClearTaint();
m_log.InfoFormat("{0} Loaded legacy heightmap. SizeX={1}, SizeY={2}", LogHeader, SizeX, SizeY);
} }
} }

4
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -1195,7 +1195,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
for (int j = y1 + 1; j <= y2; j++) for (int j = y1 + 1; j <= y2; j++)
SendLayerData(x2, j, map); SendLayerData(x2, j, map);
if (x2 - x1 > 0) if (x2 - x1 > 0 && y2 - y1 > 0)
SendLayerBottomLeft(map, x1, y1 + 1, x2 - 1, y2); SendLayerBottomLeft(map, x1, y1 + 1, x2 - 1, y2);
} }
@ -1209,7 +1209,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
for (int j = y2 - 1; j >= y1; j--) for (int j = y2 - 1; j >= y1; j--)
SendLayerData(x1, j, map); SendLayerData(x1, j, map);
if (x2 - x1 > 0) if (x2 - x1 > 0 && y2 - y1 > 0)
SendLayerTopRight(map, x1 + 1, y1, x2, y2 - 1); SendLayerTopRight(map, x1 + 1, y1, x2, y2 - 1);
} }