Attempted workaround for Mono's insistence on compiling BasicTerrain incorrectly

2 files changed, 13 insertions, 21 deletions

diff --git a/OpenSim/Region/Environment/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
index 1cab4ab..3afbe6e 100644
--- a/OpenSim/Region/Environment/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -682,8 +682,8 @@ namespace OpenSim.Region.Environment
                     }

                 }

             }

-            parcelData.AABBMin = new LLVector3((float)(min_x * 4), (float)(min_y * 4), m_world.Terrain[(min_x * 4), (min_y * 4)]);

-            parcelData.AABBMax = new LLVector3((float)(max_x * 4), (float)(max_y * 4), m_world.Terrain[(max_x * 4), (max_y * 4)]);

+            parcelData.AABBMin = new LLVector3((float)(min_x * 4), (float)(min_y * 4), (float)m_world.Terrain.get((min_x * 4), (min_y * 4)));

+            parcelData.AABBMax = new LLVector3((float)(max_x * 4), (float)(max_y * 4), (float)m_world.Terrain.get((max_x * 4), (max_y * 4)));

             parcelData.area = tempArea;

         }

 

diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index 0ad60df..8bd09e3 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -815,6 +815,17 @@ namespace OpenSim.Region.Terrain
         }

 

         /// <summary>

+        /// Wrapper to heightmap.get()

+        /// </summary>

+        /// <param name="x">X coord</param>

+        /// <param name="y">Y coord</param>

+        /// <returns>Height at specified coordinates</returns>

+        public double get(int x, int y)

+        {

+            return heightmap.get(x, y);

+        }

+

+        /// <summary>

         /// Multiplies the heightfield by val

         /// </summary>

         /// <param name="meep">The heightfield</param>

@@ -828,25 +839,6 @@ namespace OpenSim.Region.Terrain
         }

 

         /// <summary>

-        /// Returns the height at the coordinates x,y

-        /// </summary>

-        /// <param name="x">X Coordinate</param>

-        /// <param name="y">Y Coordinate</param>

-        /// <returns></returns>

-        public float this[int x, int y]

-        {

-            get

-            {

-                return (float)heightmap.get(x, y);

-            }

-            set

-            {

-                tainted++;

-                heightmap.set(x, y, (double)value);

-            }

-        }

-

-        /// <summary>

         /// Exports the current heightmap to a PNG file

         /// </summary>

         /// <param name="filename">The destination filename for the image</param>