diff options
| author | UbitUmarov | 2017-09-05 20:25:12 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-09-05 20:25:12 +0100 |
| commit | ca493a1bebfe544c31883fc8796ce1d05a4ed181 (patch) | |
| tree | cb5583832fd78bae24ebb9e04559d9eb5bade896 /OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | BulletSim: Merge branch 'BulletSim2017' (diff) | |
| download | opensim-SC-ca493a1bebfe544c31883fc8796ce1d05a4ed181.zip opensim-SC-ca493a1bebfe544c31883fc8796ce1d05a4ed181.tar.gz opensim-SC-ca493a1bebfe544c31883fc8796ce1d05a4ed181.tar.bz2 opensim-SC-ca493a1bebfe544c31883fc8796ce1d05a4ed181.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs index b153761..f085d70 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs | |||
| @@ -790,8 +790,6 @@ public class BSPrim : BSPhysObject | |||
| 790 | public override OMV.Vector3 ForceVelocity { | 790 | public override OMV.Vector3 ForceVelocity { |
| 791 | get { return RawVelocity; } | 791 | get { return RawVelocity; } |
| 792 | set { | 792 | set { |
| 793 | PhysScene.AssertInTaintTime("BSPrim.ForceVelocity"); | ||
| 794 | |||
| 795 | RawVelocity = Util.ClampV(value, BSParam.MaxLinearVelocity); | 793 | RawVelocity = Util.ClampV(value, BSParam.MaxLinearVelocity); |
| 796 | if (PhysBody.HasPhysicalBody) | 794 | if (PhysBody.HasPhysicalBody) |
| 797 | { | 795 | { |