diff options
| author | Robert Adams | 2013-01-23 09:09:17 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-01-23 14:25:18 -0800 |
| commit | a5e9c665f08059fef16d0b0875697cb08e16351e (patch) | |
| tree | 61d11e9cb950fb7fe780dc96466bc8ba426937b9 /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
| parent | BulletSim: working on COM (diff) | |
| download | opensim-SC_OLD-a5e9c665f08059fef16d0b0875697cb08e16351e.zip opensim-SC_OLD-a5e9c665f08059fef16d0b0875697cb08e16351e.tar.gz opensim-SC_OLD-a5e9c665f08059fef16d0b0875697cb08e16351e.tar.bz2 opensim-SC_OLD-a5e9c665f08059fef16d0b0875697cb08e16351e.tar.xz | |
BulletSim: center-of-gravity linkset changes. Not working yet.
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 8075b73..34fd2a0 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
| @@ -708,8 +708,8 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
| 708 | // TriggerPreStepEvent | 708 | // TriggerPreStepEvent |
| 709 | // DoOneTimeTaints | 709 | // DoOneTimeTaints |
| 710 | // Step() | 710 | // Step() |
| 711 | // ProcessAndForwardCollisions | 711 | // ProcessAndSendToSimulatorCollisions |
| 712 | // ProcessAndForwardPropertyUpdates | 712 | // ProcessAndSendToSimulatorPropertyUpdates |
| 713 | // TriggerPostStepEvent | 713 | // TriggerPostStepEvent |
| 714 | 714 | ||
| 715 | // Calls to the PhysicsActors can't directly call into the physics engine | 715 | // Calls to the PhysicsActors can't directly call into the physics engine |