diff options
| author | UbitUmarov | 2012-12-04 02:46:40 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-12-04 02:46:40 +0000 |
| commit | b6d29aa124cf1ec1c1dbe6874720e6cc39faf06f (patch) | |
| tree | e71a0e511e0b070d4ab28f4012c82860fe99cd48 /OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs | |
| parent | raise standing avatar a bit to reduce knees bending on some collisions. (diff) | |
| download | opensim-SC_OLD-b6d29aa124cf1ec1c1dbe6874720e6cc39faf06f.zip opensim-SC_OLD-b6d29aa124cf1ec1c1dbe6874720e6cc39faf06f.tar.gz opensim-SC_OLD-b6d29aa124cf1ec1c1dbe6874720e6cc39faf06f.tar.bz2 opensim-SC_OLD-b6d29aa124cf1ec1c1dbe6874720e6cc39faf06f.tar.xz | |
move characters (avatars) to own collision space, also fixing a problem
with previus code that was still assuming the avatar is g2
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs index 799a324..f449099 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs | |||
| @@ -324,7 +324,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 324 | { | 324 | { |
| 325 | // Collide tests | 325 | // Collide tests |
| 326 | if ((CurrentRayFilter & FilterActiveSpace) != 0) | 326 | if ((CurrentRayFilter & FilterActiveSpace) != 0) |
| 327 | { | ||
| 327 | d.SpaceCollide2(ray, m_scene.ActiveSpace, IntPtr.Zero, nearCallback); | 328 | d.SpaceCollide2(ray, m_scene.ActiveSpace, IntPtr.Zero, nearCallback); |
| 329 | d.SpaceCollide2(ray, m_scene.CharsSpace, IntPtr.Zero, nearCallback); | ||
| 330 | } | ||
| 328 | if ((CurrentRayFilter & FilterStaticSpace) != 0 && (m_contactResults.Count < CurrentMaxCount)) | 331 | if ((CurrentRayFilter & FilterStaticSpace) != 0 && (m_contactResults.Count < CurrentMaxCount)) |
| 329 | d.SpaceCollide2(ray, m_scene.StaticSpace, IntPtr.Zero, nearCallback); | 332 | d.SpaceCollide2(ray, m_scene.StaticSpace, IntPtr.Zero, nearCallback); |
| 330 | if ((CurrentRayFilter & RayFilterFlags.land) != 0 && (m_contactResults.Count < CurrentMaxCount)) | 333 | if ((CurrentRayFilter & RayFilterFlags.land) != 0 && (m_contactResults.Count < CurrentMaxCount)) |