diff options
| author | Robert Adams | 2013-06-29 06:42:38 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-06-30 17:07:48 -0700 |
| commit | 2f4a729d408acfd311c8b7bc53d2cbff9d2ddfad (patch) | |
| tree | 4982e09d5e7049041d3aafb00def1443a223cb5a /OpenSim/Region | |
| parent | Groups V2: charge for group creation only after the group has been successful... (diff) | |
| download | opensim-SC-2f4a729d408acfd311c8b7bc53d2cbff9d2ddfad.zip opensim-SC-2f4a729d408acfd311c8b7bc53d2cbff9d2ddfad.tar.gz opensim-SC-2f4a729d408acfd311c8b7bc53d2cbff9d2ddfad.tar.bz2 opensim-SC-2f4a729d408acfd311c8b7bc53d2cbff9d2ddfad.tar.xz | |
BulletSim: add inTaintTime parameter to collision cache clear function.
Diffstat (limited to 'OpenSim/Region')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs index 6437b04..d17c8e7 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |||
| @@ -706,7 +706,7 @@ public static class BSParam | |||
| 706 | new ParameterDefn<float>("ResetBroadphasePool", "Setting this is any value resets the broadphase collision pool", | 706 | new ParameterDefn<float>("ResetBroadphasePool", "Setting this is any value resets the broadphase collision pool", |
| 707 | 0f, | 707 | 0f, |
| 708 | (s) => { return 0f; }, | 708 | (s) => { return 0f; }, |
| 709 | (s,v) => { BSParam.ResetBroadphasePoolTainted(s, v); } ), | 709 | (s,v) => { BSParam.ResetBroadphasePoolTainted(s, v, false /* inTaintTime */); } ), |
| 710 | new ParameterDefn<float>("ResetConstraintSolver", "Setting this is any value resets the constraint solver", | 710 | new ParameterDefn<float>("ResetConstraintSolver", "Setting this is any value resets the constraint solver", |
| 711 | 0f, | 711 | 0f, |
| 712 | (s) => { return 0f; }, | 712 | (s) => { return 0f; }, |
| @@ -792,10 +792,10 @@ public static class BSParam | |||
| 792 | // ===================================================================== | 792 | // ===================================================================== |
| 793 | // There are parameters that, when set, cause things to happen in the physics engine. | 793 | // There are parameters that, when set, cause things to happen in the physics engine. |
| 794 | // This causes the broadphase collision cache to be cleared. | 794 | // This causes the broadphase collision cache to be cleared. |
| 795 | private static void ResetBroadphasePoolTainted(BSScene pPhysScene, float v) | 795 | private static void ResetBroadphasePoolTainted(BSScene pPhysScene, float v, bool inTaintTime) |
| 796 | { | 796 | { |
| 797 | BSScene physScene = pPhysScene; | 797 | BSScene physScene = pPhysScene; |
| 798 | physScene.TaintedObject("BSParam.ResetBroadphasePoolTainted", delegate() | 798 | physScene.TaintedObject(inTaintTime, "BSParam.ResetBroadphasePoolTainted", delegate() |
| 799 | { | 799 | { |
| 800 | physScene.PE.ResetBroadphasePool(physScene.World); | 800 | physScene.PE.ResetBroadphasePool(physScene.World); |
| 801 | }); | 801 | }); |