diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-06-16 16:41:52 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-06-16 16:41:52 -0400 |
| commit | 903729d5c97c9f93daf463e155055653b92f8fe4 (patch) | |
| tree | 178e5b9e774702c046f3e7d279ef5b9ef8fc4d1b /indra/newview/llphysicsmotion.cpp | |
| parent | f3a037f8ad520b7b070fdd057ce2d0b012121efd (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
Merge. Refresh from viewer-release after 3.7.9 release.
Diffstat (limited to 'indra/newview/llphysicsmotion.cpp')
| -rwxr-xr-x | indra/newview/llphysicsmotion.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp index 05ef436bd9..ea10d03264 100755 --- a/indra/newview/llphysicsmotion.cpp +++ b/indra/newview/llphysicsmotion.cpp @@ -668,9 +668,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time) if ((driver_param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE) && (driver_param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT)) { - mCharacter->setVisualParamWeight(driver_param, - 0, - FALSE); + mCharacter->setVisualParamWeight(driver_param, 0); } S32 num_driven = driver_param->getDrivenParamsCount(); for (S32 i = 0; i < num_driven; ++i) @@ -770,7 +768,5 @@ void LLPhysicsMotion::setParamValue(const LLViewerVisualParam *param, // Scale from [0,1] to [value_min_local,value_max_local] const F32 new_value_local = value_min_local + (value_max_local-value_min_local) * new_value_rescaled; - mCharacter->setVisualParamWeight(param, - new_value_local, - FALSE); + mCharacter->setVisualParamWeight(param, new_value_local); } |