Changes to TerrainChannel/ITerrainChannel to support importing OARs with different Region sizes to the destination region.

Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>

1 files changed, 8 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs b/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs
index f660b8d..78db02a 100644
--- a/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs
+++ b/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs
@@ -59,5 +59,13 @@ namespace OpenSim.Region.Framework.Interfaces
         void LoadFromXmlString(string data);
         // Merge some terrain into this channel
         void Merge(ITerrainChannel newTerrain, Vector3 displacement, float radianRotation, Vector2 rotationDisplacement);
+
+        /// </summary>
+        /// <param name="newTerrain"></param>
+        /// <param name="displacement">&lt;x, y, z&gt;</param>
+        /// <param name="rotationDegrees"></param>
+        /// <param name="boundingOrigin">&lt;x, y&gt;</param>
+        /// <param name="boundingSize">&lt;x, y&gt;</param>
+        void MergeWithBounding(ITerrainChannel newTerrain, Vector3 displacement, float rotationDegrees, Vector2 boundingOrigin, Vector2 boundingSize);
     }
 }