ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Fixes Terrain issues with combined regions.

Browse Source
This commit is contained in:
Teravus Ovares (Dan Olivares)
2009-08-20 23:26:40 -04:00
parent c9b52cd0b6
commit 64dcb71c14
2 changed files with 137 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
View File

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