diff options
| author | Robert Adams | 2012-12-29 21:43:43 -0800 |
|---|---|---|
| committer | Robert Adams | 2012-12-31 19:57:21 -0800 |
| commit | 48f718f39fcd61501262878a8bcfbd98efed29d2 (patch) | |
| tree | aa67dbaf54d75152f01302921bbc42226daaec8b /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
| parent | BulletSim: change physical data structures to classes. Add default (diff) | |
| download | opensim-SC-48f718f39fcd61501262878a8bcfbd98efed29d2.zip opensim-SC-48f718f39fcd61501262878a8bcfbd98efed29d2.tar.gz opensim-SC-48f718f39fcd61501262878a8bcfbd98efed29d2.tar.bz2 opensim-SC-48f718f39fcd61501262878a8bcfbd98efed29d2.tar.xz | |
BulletSim: first round of conversion from direct BulletSimAPI interfacing by BulletSim core to using the BulletSimAPITemplate. Physical object creation and destruction first.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index 2de4717..cf09be2 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
| @@ -845,7 +845,7 @@ public sealed class BSPrim : BSPhysObject | |||
| 845 | // the functions after this one set up the state of a possibly newly created collision body. | 845 | // the functions after this one set up the state of a possibly newly created collision body. |
| 846 | private void MakeSolid(bool makeSolid) | 846 | private void MakeSolid(bool makeSolid) |
| 847 | { | 847 | { |
| 848 | CollisionObjectTypes bodyType = (CollisionObjectTypes)BulletSimAPI.GetBodyType2(PhysBody.ptr); | 848 | CollisionObjectTypes bodyType = (CollisionObjectTypes)PhysicsScene.PE.GetBodyType(PhysBody); |
| 849 | if (makeSolid) | 849 | if (makeSolid) |
| 850 | { | 850 | { |
| 851 | // Verify the previous code created the correct shape for this type of thing. | 851 | // Verify the previous code created the correct shape for this type of thing. |