diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-06-24 17:21:25 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-06-24 17:21:25 -0400 |
| commit | bdede955c3ccffb163fa010e01eb4eca71c36b11 (patch) | |
| tree | d1c2c89de569ee3d2ba83fa758b9fd9024481fb4 /indra/llcharacter/llvisualparam.cpp | |
| parent | be731a31de18b10c6d2cf8cfd4187a34fbe117fd (diff) | |
| parent | f89bbd3baa6dd87b0477a240e7cde09c6aed3293 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release/
Diffstat (limited to 'indra/llcharacter/llvisualparam.cpp')
| -rw-r--r-- | indra/llcharacter/llvisualparam.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcharacter/llvisualparam.cpp b/indra/llcharacter/llvisualparam.cpp index 703fe2f9cc..122406e20b 100644 --- a/indra/llcharacter/llvisualparam.cpp +++ b/indra/llcharacter/llvisualparam.cpp @@ -261,7 +261,7 @@ void LLVisualParam::setAnimationTarget(F32 target_value, BOOL upload_bake) if (mInfo) { - if (getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE) + if (isTweakable()) { mTargetWeight = llclamp(target_value, mInfo->mMinWeight, mInfo->mMaxWeight); } @@ -305,7 +305,7 @@ void LLVisualParam::animate( F32 delta, BOOL upload_bake ) //----------------------------------------------------------------------------- void LLVisualParam::stopAnimating(BOOL upload_bake) { - if (mIsAnimating && getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE) + if (mIsAnimating && isTweakable()) { mIsAnimating = FALSE; setWeight(mTargetWeight, upload_bake); |