diff options
author | Justin Clark-Casey (justincc) | 2012-09-08 00:17:57 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-09-08 00:17:57 +0100 |
commit | fa3edcf55c941811220d7502e1fcf1025ed85f79 (patch) | |
tree | b72f8ee5e843bcfac3623ea1c043b5b05434f55c /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
parent | 4096 is used in various places as the maximum height of a region, refactoring... (diff) | |
parent | BulletSim: update the DLLs and SOs (diff) | |
download | opensim-SC_OLD-fa3edcf55c941811220d7502e1fcf1025ed85f79.zip opensim-SC_OLD-fa3edcf55c941811220d7502e1fcf1025ed85f79.tar.gz opensim-SC_OLD-fa3edcf55c941811220d7502e1fcf1025ed85f79.tar.bz2 opensim-SC_OLD-fa3edcf55c941811220d7502e1fcf1025ed85f79.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index ef463ca..e411fcb 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
@@ -48,7 +48,11 @@ public abstract class BSPhysObject : PhysicsActor | |||
48 | // Return the object mass without calculating it or side effects | 48 | // Return the object mass without calculating it or side effects |
49 | public abstract float MassRaw { get; } | 49 | public abstract float MassRaw { get; } |
50 | 50 | ||
51 | public abstract BulletBody Body { get; set; } | 51 | // Reference to the physical body (btCollisionObject) of this object |
52 | public abstract BulletBody BSBody { get; set; } | ||
53 | // Reference to the physical shape (btCollisionShape) of this object | ||
54 | public abstract BulletShape BSShape { get; set; } | ||
55 | |||
52 | public abstract void ZeroMotion(); | 56 | public abstract void ZeroMotion(); |
53 | 57 | ||
54 | public virtual void StepVehicle(float timeStep) { } | 58 | public virtual void StepVehicle(float timeStep) { } |