diff --git a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
index 18e5ec56c9..8ea86687c8 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
@@ -236,7 +236,10 @@ namespace OpenSim.Region.Physics.OdePlugin
                 return;
             if (g2 == m_scene.LandGeom)
                 return;
-             
+            if (g1 == m_scene.WaterGeom)
+                return;
+            if (g2 == m_scene.WaterGeom)
+                return;
             
             
             
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 63b56f4159..83db396357 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -179,7 +179,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         private readonly IntPtr contactgroup;
         internal IntPtr LandGeom;
 
-        private IntPtr WaterGeom;
+        internal IntPtr WaterGeom;
 
         private float nmTerrainContactFriction = 255.0f;
         private float nmTerrainContactBounce = 0.1f;