From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001
From: onefang
Date: Sun, 19 May 2019 21:24:15 +1000
Subject: Dump OpenSim 0.9.0.1 into it's own branch.

---
 OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Framework/Interfaces/ITerrainModule.cs')

diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
index 28f797a..3fc5ce7 100644
--- a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
@@ -24,10 +24,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-using System.IO;
 
+using System.IO;
 using OpenSim.Framework;
-
 using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Interfaces
@@ -43,13 +42,13 @@ namespace OpenSim.Region.Framework.Interfaces
         /// Use this if you change terrain data outside of the terrain module (e.g. in osTerrainSetHeight)
         /// </summary>
         void TaintTerrain();
-        
+
         /// <summary>
         /// When a client initially connects, all the terrain must be pushed to the viewer.
         /// This call causes all the terrain patches to be sent to the client.
         /// </summary>
         void PushTerrain(IClientAPI pClient);
-        
+
         /// <summary>
         /// Load a terrain from a stream.
         /// </summary>
@@ -58,8 +57,11 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </param>
         /// <param name="stream"></param>
         void LoadFromStream(string filename, Stream stream);
-        void LoadFromStream(string filename, Vector3 displacement, float radianRotation, Vector2 rotationDisplacement, Stream stream);
         void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap);
+        void LoadFromStream(string filename, Vector3 displacement,
+                                float radianRotation, Vector2 rotationDisplacement, Stream stream);
+        void LoadFromStream(string filename, Vector3 displacement,
+                                float rotationDegress, Vector2 boundingOrigin, Vector2 boundingSize, Stream stream);
         /// <summary>
         /// Save a terrain to a stream.
         /// </summary>
-- 
cgit v1.1