diff options
author | Jak Daniels | 2015-11-18 18:11:16 +0000 |
---|---|---|
committer | UbitUmarov | 2015-11-22 01:32:08 +0000 |
commit | 7cac0ccbe3078f49c75fa944b3aae85fde2ace13 (patch) | |
tree | 5d129271db98c6a350fb1c672f204502667f9222 /OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs | |
parent | Changes to LandObject/ILandObject to support importing OARs with different Re... (diff) | |
download | opensim-SC_OLD-7cac0ccbe3078f49c75fa944b3aae85fde2ace13.zip opensim-SC_OLD-7cac0ccbe3078f49c75fa944b3aae85fde2ace13.tar.gz opensim-SC_OLD-7cac0ccbe3078f49c75fa944b3aae85fde2ace13.tar.bz2 opensim-SC_OLD-7cac0ccbe3078f49c75fa944b3aae85fde2ace13.tar.xz |
Changes to TerrainChannel/ITerrainChannel to support importing OARs with different Region sizes to the destination region.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs | 8 |
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"><x, y, z></param> | ||
66 | /// <param name="rotationDegrees"></param> | ||
67 | /// <param name="boundingOrigin"><x, y></param> | ||
68 | /// <param name="boundingSize"><x, y></param> | ||
69 | void MergeWithBounding(ITerrainChannel newTerrain, Vector3 displacement, float rotationDegrees, Vector2 boundingOrigin, Vector2 boundingSize); | ||
62 | } | 70 | } |
63 | } | 71 | } |