diff options
| author | Robert Adams | 2012-11-01 10:23:37 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-11-03 21:15:14 -0700 |
| commit | 39c02dcc8c537d5989238ec97c876e033895a8a9 (patch) | |
| tree | b23392da13d4ff36ba3258d0239ea928584a6a99 /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |
| parent | BulletSim: rename BSBody and BSShape to PhysBody and PhysShape. Add skeleton ... (diff) | |
| download | opensim-SC_OLD-39c02dcc8c537d5989238ec97c876e033895a8a9.zip opensim-SC_OLD-39c02dcc8c537d5989238ec97c876e033895a8a9.tar.gz opensim-SC_OLD-39c02dcc8c537d5989238ec97c876e033895a8a9.tar.bz2 opensim-SC_OLD-39c02dcc8c537d5989238ec97c876e033895a8a9.tar.xz | |
BulletSim: Remove use of shapeData in ShapeCollection and rely on the available BSPhysObject varaiables. Fix line endings in BSLinksetCompound.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index 9b7ba03..3b6355c 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
| @@ -194,6 +194,7 @@ public struct ShapeData | |||
| 194 | // following defined by BulletSim | 194 | // following defined by BulletSim |
| 195 | SHAPE_GROUNDPLANE = 20, | 195 | SHAPE_GROUNDPLANE = 20, |
| 196 | SHAPE_TERRAIN = 21, | 196 | SHAPE_TERRAIN = 21, |
| 197 | SHAPE_COMPOUND = 22, | ||
| 197 | }; | 198 | }; |
| 198 | public uint ID; | 199 | public uint ID; |
| 199 | public PhysicsShapeType Type; | 200 | public PhysicsShapeType Type; |