From e2e43f1ab7b412325e6f57790a4a717b8f918bd5 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Wed, 22 Jul 2009 04:11:51 +0000
Subject: * Whoops, forgot the water heightfield.

---
 OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs | 5 ++++-
 OpenSim/Region/Physics/OdePlugin/OdePlugin.cs                | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
index 18e5ec5..8ea8668 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 63b56f4..83db396 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;
-- 
cgit v1.1