aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-20 23:26:40 -0400
committerTeravus Ovares (Dan Olivares)2009-08-20 23:26:40 -0400
commit64dcb71c1430f4b97f4e8af944662c182bc1ef64 (patch)
treefc5e28216286c70617fa24a0c2b5ae3862ca069f /OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
parent* Adds PhysicsCombiner Module (diff)
downloadopensim-SC_OLD-64dcb71c1430f4b97f4e8af944662c182bc1ef64.zip
opensim-SC_OLD-64dcb71c1430f4b97f4e8af944662c182bc1ef64.tar.gz
opensim-SC_OLD-64dcb71c1430f4b97f4e8af944662c182bc1ef64.tar.bz2
opensim-SC_OLD-64dcb71c1430f4b97f4e8af944662c182bc1ef64.tar.xz
* Fixes Terrain issues with combined regions.
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs13
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
232 */ 232 */
233 233
234 // Exclude heightfield geom 234 // Exclude heightfield geom
235 if (g1 == m_scene.LandGeom) 235
236 return; 236 if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
237 if (g2 == m_scene.LandGeom)
238 return;
239 if (g1 == m_scene.WaterGeom)
240 return; 237 return;
241 if (g2 == m_scene.WaterGeom) 238 if (d.GeomGetClass(g1) == d.GeomClassID.HeightfieldClass || d.GeomGetClass(g2) == d.GeomClassID.HeightfieldClass)
242 return; 239 return;
243 240
244
245
246 // Raytest against AABBs of spaces first, then dig into the spaces it hits for actual geoms. 241 // Raytest against AABBs of spaces first, then dig into the spaces it hits for actual geoms.
247 if (d.GeomIsSpace(g1) || d.GeomIsSpace(g2)) 242 if (d.GeomIsSpace(g1) || d.GeomIsSpace(g2))
248 { 243 {