diff options
| author | teravus | 2012-12-18 15:00:10 -0500 |
|---|---|---|
| committer | teravus | 2012-12-18 15:00:10 -0500 |
| commit | 29cdf0f3dd99605192f29fc83bbacdf8ecb0ea8d (patch) | |
| tree | 9b8eda52bcd2022e47b0b0688eb9d548b4161f36 /OpenSim/Region/Physics/BulletSNPlugin/BulletSimData.cs | |
| parent | BulletSim: scale the force for external AddForce by the simulation (diff) | |
| download | opensim-SC_OLD-29cdf0f3dd99605192f29fc83bbacdf8ecb0ea8d.zip opensim-SC_OLD-29cdf0f3dd99605192f29fc83bbacdf8ecb0ea8d.tar.gz opensim-SC_OLD-29cdf0f3dd99605192f29fc83bbacdf8ecb0ea8d.tar.bz2 opensim-SC_OLD-29cdf0f3dd99605192f29fc83bbacdf8ecb0ea8d.tar.xz | |
* Merges BulletSim Updates to BulletSimN(BulletSNPlugin)
Diffstat (limited to 'OpenSim/Region/Physics/BulletSNPlugin/BulletSimData.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSNPlugin/BulletSimData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSNPlugin/BulletSimData.cs b/OpenSim/Region/Physics/BulletSNPlugin/BulletSimData.cs index a1ed8d8..f509dc4 100644 --- a/OpenSim/Region/Physics/BulletSNPlugin/BulletSimData.cs +++ b/OpenSim/Region/Physics/BulletSNPlugin/BulletSimData.cs | |||
| @@ -35,9 +35,9 @@ namespace OpenSim.Region.Physics.BulletSNPlugin | |||
| 35 | // These hold pointers to allocated objects in the unmanaged space. | 35 | // These hold pointers to allocated objects in the unmanaged space. |
| 36 | 36 | ||
| 37 | // The physics engine controller class created at initialization | 37 | // The physics engine controller class created at initialization |
| 38 | public struct BulletSim | 38 | public struct BulletWorld |
| 39 | { | 39 | { |
| 40 | public BulletSim(uint worldId, BSScene bss, object xx) | 40 | public BulletWorld(uint worldId, BSScene bss, object xx) |
| 41 | { | 41 | { |
| 42 | ptr = xx; | 42 | ptr = xx; |
| 43 | worldID = worldId; | 43 | worldID = worldId; |