diff options
| author | Melanie | 2013-07-04 22:32:58 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-04 22:32:58 +0100 |
| commit | 5ddcc25ee9de481c40a26aabc57d77c71225162e (patch) | |
| tree | 298768abaca492365ac1c9786b0d4ce7dae934ab /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Guard against completely unknown user UUIDs. (diff) | |
| download | opensim-SC-5ddcc25ee9de481c40a26aabc57d77c71225162e.zip opensim-SC-5ddcc25ee9de481c40a26aabc57d77c71225162e.tar.gz opensim-SC-5ddcc25ee9de481c40a26aabc57d77c71225162e.tar.bz2 opensim-SC-5ddcc25ee9de481c40a26aabc57d77c71225162e.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index a4c5e08..a0d5c42 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
| @@ -210,6 +210,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
| 210 | AddAngularForce(force, pushforce, false); | 210 | AddAngularForce(force, pushforce, false); |
| 211 | } | 211 | } |
| 212 | public abstract void AddAngularForce(OMV.Vector3 force, bool pushforce, bool inTaintTime); | 212 | public abstract void AddAngularForce(OMV.Vector3 force, bool pushforce, bool inTaintTime); |
| 213 | public abstract void AddForce(OMV.Vector3 force, bool pushforce, bool inTaintTime); | ||
| 213 | 214 | ||
| 214 | public abstract OMV.Vector3 ForceRotationalVelocity { get; set; } | 215 | public abstract OMV.Vector3 ForceRotationalVelocity { get; set; } |
| 215 | 216 | ||