* Terrain engine now knows the region coordinates - this can be later used to allow loading of single terrain files for multiple regions.

2 files changed, 12 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index d75a7f3..f9fbe87 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -157,7 +157,7 @@ namespace OpenSim.Region.Environment.Scenes
 
 
             MainLog.Instance.Verbose("Creating LandMap");
-            Terrain = new TerrainEngine();
+            Terrain = new TerrainEngine((int)this.RegionInfo.RegionLocX, (int)this.RegionInfo.RegionLocY);
 
             ScenePresence.LoadAnims();
 
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index f37d625..b54f4fe 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -88,14 +88,24 @@ namespace OpenSim.Region.Terrain
         int w, h;
 
         /// <summary>
+        /// Used to determine what offset to use when loading singular heightmaps across multiple sims
+        /// </summary>
+        private int offsetX;
+        private int offsetY;
+
+
+        /// <summary>
         /// Generate a new TerrainEngine instance and creates a new heightmap
         /// </summary>
-        public TerrainEngine()
+        public TerrainEngine(int X, int Y)
         {
             w = 256;
             h = 256;
             heightmap = new Channel(w, h);
 
+            offsetX = X;
+            offsetY = Y;
+
             tainted++;
         }