diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-06-24 17:21:18 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-06-24 17:21:18 -0400 |
| commit | f89bbd3baa6dd87b0477a240e7cde09c6aed3293 (patch) | |
| tree | 9a7a3dea0d4e55f2fa3ec70321a1fcfdeb9e4045 /indra/llcharacter/llvisualparam.cpp | |
| parent | 8f892d0f36fda170a5cecf0aea89887d6d0e45ef (diff) | |
EXT-7838 FIX - viewer 2.1 avatars look ruth-shaped to viewer-2 users
Added a third visual param group VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT
to specify visual params that are user-tweakable, but should not be sent
over the network.
We should have this group *only* for new user-tweakable visual parameters
that should not be sent over the network. These should only be used for
*new* parameters that only contribute to the generation of baked textures.
Code reviewed by Richard
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); |