* Fixes Terrain issues with combined regions.

1 files changed, 4 insertions, 9 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
index c4cb250..d9f4951 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
@@ -232,17 +232,12 @@ namespace OpenSim.Region.Physics.OdePlugin
              */
 
             // Exclude heightfield geom
-            if (g1 == m_scene.LandGeom)
-                return;
-            if (g2 == m_scene.LandGeom)
-                return;
-            if (g1 == m_scene.WaterGeom)
+
+            if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
                 return;
-            if (g2 == m_scene.WaterGeom)
+            if (d.GeomGetClass(g1) == d.GeomClassID.HeightfieldClass || d.GeomGetClass(g2) == d.GeomClassID.HeightfieldClass)
                 return;
-            
-            
-            
+
             // Raytest against AABBs of spaces first, then dig into the spaces it hits for actual geoms.
             if (d.GeomIsSpace(g1) || d.GeomIsSpace(g2))
             {