1 files changed, 16 insertions, 9 deletions

diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Common.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Common.cs
index 2ad784b..55ed90b 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Common.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Common.cs
@@ -143,15 +143,22 @@ namespace libTerrain
 
         public double Get(int x, int y)
         {
-            if (x >= w)
-                x = w - 1;
-            if (y >= h)
-                y = h - 1;
-            if (x < 0)
-                x = 0;
-            if (y < 0)
-                y = 0;
-            return map[x, y];
+            try
+            {
+                return map[x, y];
+            }
+            catch (IndexOutOfRangeException)
+            {
+                if (x >= w)
+                    x = w - 1;
+                if (y >= h)
+                    y = h - 1;
+                if (x < 0)
+                    x = 0;
+                if (y < 0)
+                    y = 0;
+                return map[x, y];
+            }
         }
 
         public void SetWrap(int x, int y, double val)