diff options
| author | UbitUmarov | 2012-02-29 05:14:29 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-02-29 05:14:29 +0000 |
| commit | a0d75be56be66e7e7dd04c8ae7760596d135af99 (patch) | |
| tree | 104a0560b139ffce0c1a10f72eaea2f9b4354090 /OpenSim | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| download | opensim-SC-a0d75be56be66e7e7dd04c8ae7760596d135af99.zip opensim-SC-a0d75be56be66e7e7dd04c8ae7760596d135af99.tar.gz opensim-SC-a0d75be56be66e7e7dd04c8ae7760596d135af99.tar.bz2 opensim-SC-a0d75be56be66e7e7dd04c8ae7760596d135af99.tar.xz | |
fix
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs index 514074c..3ed3b5a 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |||
| @@ -893,10 +893,12 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 893 | if (m_isphysical) | 893 | if (m_isphysical) |
| 894 | { | 894 | { |
| 895 | d.GeomSetCollideBits(prim_geom, (int)CollisionCategories.Land); | 895 | d.GeomSetCollideBits(prim_geom, (int)CollisionCategories.Land); |
| 896 | d.GeomDisable(prim_geom); | ||
| 897 | } | 896 | } |
| 898 | else | 897 | else |
| 898 | { | ||
| 899 | d.GeomSetCollideBits(prim_geom, 0); | 899 | d.GeomSetCollideBits(prim_geom, 0); |
| 900 | d.GeomDisable(prim_geom); | ||
| 901 | } | ||
| 900 | } | 902 | } |
| 901 | else | 903 | else |
| 902 | { | 904 | { |