* fixes mantis 3259

* I'm concerned however that the 'minimum fly height' should really be implemented in ScenePresence and not in the specific physics plugin so that all of the physics plugins can take advantage of it and if desired, a person could swap out the 'minimum fly height' functionality with other functionality.

1 files changed, 9 insertions, 0 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 0a6faa8..7a01702 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1295,6 +1295,15 @@ namespace OpenSim.Region.Physics.OdePlugin
 // Recovered for use by fly height. Kitto Flora
         public float GetTerrainHeightAtXY(float x, float y)
         {
+            // Teravus: Kitto, this code causes recurring errors that stall physics permenantly unless 
+            // the values are checked, so checking below.
+            // Is there any reason that we don't do this in ScenePresence?   
+            // The only physics engine that benefits from it in the physics plugin is this one
+
+            if ((int)x > Constants.RegionSize || (int)y > Constants.RegionSize || 
+                (int)x < 0.001f || (int)y < 0.001f)
+                return 0;
+
             return (float)_origheightmap[(int)y * Constants.RegionSize + (int)x];
         }
 // End recovered. Kitto Flora