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
parent
976530569a
commit
92c06a5d0b
|
@ -280,9 +280,11 @@ namespace OpenSim.Framework
|
|||
{
|
||||
case DBTerrainRevision.Compressed2D:
|
||||
FromCompressedTerrainSerialization(pBlob);
|
||||
m_log.DebugFormat("{0} HeightmapTerrainData create from Compressed2D serialization. Size=<{1},{2}>", LogHeader, SizeX, SizeY);
|
||||
break;
|
||||
default:
|
||||
FromLegacyTerrainSerialization(pBlob);
|
||||
m_log.DebugFormat("{0} HeightmapTerrainData create from legacy serialization. Size=<{1},{2}>", LogHeader, SizeX, SizeY);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -333,8 +335,6 @@ namespace OpenSim.Framework
|
|||
}
|
||||
}
|
||||
ClearTaint();
|
||||
|
||||
m_log.InfoFormat("{0} Loaded legacy heightmap. SizeX={1}, SizeY={2}", LogHeader, SizeX, SizeY);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1195,7 +1195,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
for (int j = y1 + 1; j <= y2; j++)
|
||||
SendLayerData(x2, j, map);
|
||||
|
||||
if (x2 - x1 > 0)
|
||||
if (x2 - x1 > 0 && y2 - y1 > 0)
|
||||
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--)
|
||||
SendLayerData(x1, j, map);
|
||||
|
||||
if (x2 - x1 > 0)
|
||||
if (x2 - x1 > 0 && y2 - y1 > 0)
|
||||
SendLayerTopRight(map, x1 + 1, y1, x2, y2 - 1);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue