diff options
author | Oz Linden <oz@lindenlab.com> | 2014-06-16 11:42:37 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-06-16 11:42:37 -0400 |
commit | e15002a11cf5081e0697065cb017ba0af6c4b32d (patch) | |
tree | d60ac6d3a85d114b7860e42be5d9ff3338a6a169 /indra/newview/llscrollingpanelparam.cpp | |
parent | 78be5c3aa5f7263698bec5bcbccb24c150f78d09 (diff) | |
parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) |
merge changes for 3.7.9-release
Diffstat (limited to 'indra/newview/llscrollingpanelparam.cpp')
-rwxr-xr-x | indra/newview/llscrollingpanelparam.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llscrollingpanelparam.cpp b/indra/newview/llscrollingpanelparam.cpp index a7e24b86b1..bfa453a0ae 100755 --- a/indra/newview/llscrollingpanelparam.cpp +++ b/indra/newview/llscrollingpanelparam.cpp @@ -266,7 +266,7 @@ void LLScrollingPanelParam::onHintHeldDown( LLVisualParamHint* hint ) if (slider->getMinValue() < new_percent && new_percent < slider->getMaxValue()) { - mWearable->setVisualParamWeight( hint->getVisualParam()->getID(), new_weight, FALSE); + mWearable->setVisualParamWeight( hint->getVisualParam()->getID(), new_weight); mWearable->writeToAvatar(gAgentAvatarp); gAgentAvatarp->updateVisualParams(); @@ -299,7 +299,7 @@ void LLScrollingPanelParam::onHintMinMouseUp( void* userdata ) if (slider->getMinValue() < new_percent && new_percent < slider->getMaxValue()) { - self->mWearable->setVisualParamWeight(hint->getVisualParam()->getID(), new_weight, FALSE); + self->mWearable->setVisualParamWeight(hint->getVisualParam()->getID(), new_weight); self->mWearable->writeToAvatar(gAgentAvatarp); slider->setValue( self->weightToPercent( new_weight ) ); } @@ -333,7 +333,7 @@ void LLScrollingPanelParam::onHintMaxMouseUp( void* userdata ) if (slider->getMinValue() < new_percent && new_percent < slider->getMaxValue()) { - self->mWearable->setVisualParamWeight(hint->getVisualParam()->getID(), new_weight, FALSE); + self->mWearable->setVisualParamWeight(hint->getVisualParam()->getID(), new_weight); self->mWearable->writeToAvatar(gAgentAvatarp); slider->setValue( self->weightToPercent( new_weight ) ); } |