aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs')
-rw-r--r--OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs8
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
59 void LoadFromXmlString(string data); 59 void LoadFromXmlString(string data);
60 // Merge some terrain into this channel 60 // Merge some terrain into this channel
61 void Merge(ITerrainChannel newTerrain, Vector3 displacement, float radianRotation, Vector2 rotationDisplacement); 61 void Merge(ITerrainChannel newTerrain, Vector3 displacement, float radianRotation, Vector2 rotationDisplacement);
62
63 /// </summary>
64 /// <param name="newTerrain"></param>
65 /// <param name="displacement">&lt;x, y, z&gt;</param>
66 /// <param name="rotationDegrees"></param>
67 /// <param name="boundingOrigin">&lt;x, y&gt;</param>
68 /// <param name="boundingSize">&lt;x, y&gt;</param>
69 void MergeWithBounding(ITerrainChannel newTerrain, Vector3 displacement, float rotationDegrees, Vector2 boundingOrigin, Vector2 boundingSize);
62 } 70 }
63} 71}