Merge branch 'ubitwork'

This commit is contained in:
Melanie
2012-04-17 00:09:04 +02:00
2 changed files with 24 additions and 2 deletions

View File

@@ -117,6 +117,7 @@ namespace OpenSim.Region.Physics.OdePlugin
// Default, Collide with Other Geometries, spaces, bodies and characters.
private CollisionCategories m_collisionFlags = (CollisionCategories.Character
| CollisionCategories.Geom
| CollisionCategories.VolumeDtc
);
// we do land collisions not ode | CollisionCategories.Land);
public IntPtr Body = IntPtr.Zero;