diff options
| author | Robert Adams | 2017-09-02 13:08:54 -0700 |
|---|---|---|
| committer | Robert Adams | 2017-09-02 13:08:54 -0700 |
| commit | 33e773959f2ffee6d197fcb2de82ff3cfc12b153 (patch) | |
| tree | 8f8777407a6e87f9c6384a5b8f2693f2a65e576d /OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs | |
| parent | BulletSim: most of the plumbing for raycast. Needs new BulletSim.dll to (diff) | |
| parent | BulletSim: add clock and change logic for taint processing a little (diff) | |
| download | opensim-SC_OLD-33e773959f2ffee6d197fcb2de82ff3cfc12b153.zip opensim-SC_OLD-33e773959f2ffee6d197fcb2de82ff3cfc12b153.tar.gz opensim-SC_OLD-33e773959f2ffee6d197fcb2de82ff3cfc12b153.tar.bz2 opensim-SC_OLD-33e773959f2ffee6d197fcb2de82ff3cfc12b153.tar.xz | |
BulletSim: modify taint processing which use locks.
(Merge branch 'bullettaint' into bulletcast)
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs index b153761..e1990ee 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs | |||
| @@ -790,7 +790,7 @@ 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"); | 793 | PhysScene.AssertNotInSimulationTime("BSPrim.ForceVelocity"); |
| 794 | 794 | ||
| 795 | RawVelocity = Util.ClampV(value, BSParam.MaxLinearVelocity); | 795 | RawVelocity = Util.ClampV(value, BSParam.MaxLinearVelocity); |
| 796 | if (PhysBody.HasPhysicalBody) | 796 | if (PhysBody.HasPhysicalBody) |