diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/TerrainChannel.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/TerrainChannel.cs | 4 |
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++) |