diff options
| author | Melanie | 2012-04-17 00:09:04 +0200 |
|---|---|---|
| committer | Melanie | 2012-04-17 00:09:04 +0200 |
| commit | d30b18b1de5b73c0bb232605407a9eadfd45463a (patch) | |
| tree | 4eb491ae88936fc4effeaed70cc8f8b4985b4fd2 /OpenSim/Region/Physics | |
| parent | Merge branch 'ubitwork' (diff) | |
| parent | ubitODE: bug fix let avatars colide with volume detectors (diff) | |
| download | opensim-SC_OLD-d30b18b1de5b73c0bb232605407a9eadfd45463a.zip opensim-SC_OLD-d30b18b1de5b73c0bb232605407a9eadfd45463a.tar.gz opensim-SC_OLD-d30b18b1de5b73c0bb232605407a9eadfd45463a.tar.bz2 opensim-SC_OLD-d30b18b1de5b73c0bb232605407a9eadfd45463a.tar.xz | |
Merge branch 'ubitwork'
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs index 3185aad..9c1b87b 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |||
| @@ -117,6 +117,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 117 | // Default, Collide with Other Geometries, spaces, bodies and characters. | 117 | // Default, Collide with Other Geometries, spaces, bodies and characters. |
| 118 | private CollisionCategories m_collisionFlags = (CollisionCategories.Character | 118 | private CollisionCategories m_collisionFlags = (CollisionCategories.Character |
| 119 | | CollisionCategories.Geom | 119 | | CollisionCategories.Geom |
| 120 | | CollisionCategories.VolumeDtc | ||
| 120 | ); | 121 | ); |
| 121 | // we do land collisions not ode | CollisionCategories.Land); | 122 | // we do land collisions not ode | CollisionCategories.Land); |
| 122 | public IntPtr Body = IntPtr.Zero; | 123 | public IntPtr Body = IntPtr.Zero; |