diff options
| author | Teravus Ovares | 2009-07-22 04:11:51 +0000 |
|---|---|---|
| committer | Teravus Ovares | 2009-07-22 04:11:51 +0000 |
| commit | e2e43f1ab7b412325e6f57790a4a717b8f918bd5 (patch) | |
| tree | e17e89deeb7e9e470bfb123ba1ac3141e414f3ad /OpenSim | |
| parent | * Exclude heightfield geom from the raycast test. (diff) | |
| download | opensim-SC-e2e43f1ab7b412325e6f57790a4a717b8f918bd5.zip opensim-SC-e2e43f1ab7b412325e6f57790a4a717b8f918bd5.tar.gz opensim-SC-e2e43f1ab7b412325e6f57790a4a717b8f918bd5.tar.bz2 opensim-SC-e2e43f1ab7b412325e6f57790a4a717b8f918bd5.tar.xz | |
* Whoops, forgot the water heightfield.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs | 5 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 2 |
2 files changed, 5 insertions, 2 deletions
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 | |||
| 236 | return; | 236 | return; |
| 237 | if (g2 == m_scene.LandGeom) | 237 | if (g2 == m_scene.LandGeom) |
| 238 | return; | 238 | return; |
| 239 | 239 | if (g1 == m_scene.WaterGeom) | |
| 240 | return; | ||
| 241 | if (g2 == m_scene.WaterGeom) | ||
| 242 | return; | ||
| 240 | 243 | ||
| 241 | 244 | ||
| 242 | 245 | ||
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 | |||
| 179 | private readonly IntPtr contactgroup; | 179 | private readonly IntPtr contactgroup; |
| 180 | internal IntPtr LandGeom; | 180 | internal IntPtr LandGeom; |
| 181 | 181 | ||
| 182 | private IntPtr WaterGeom; | 182 | internal IntPtr WaterGeom; |
| 183 | 183 | ||
| 184 | private float nmTerrainContactFriction = 255.0f; | 184 | private float nmTerrainContactFriction = 255.0f; |
| 185 | private float nmTerrainContactBounce = 0.1f; | 185 | private float nmTerrainContactBounce = 0.1f; |