diff options
| author | angela <angela@lindenlab.com> | 2009-10-30 08:12:41 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-10-30 08:12:41 +0800 |
| commit | 8c7f5e902625173aada5377c5972b72a684bedf0 (patch) | |
| tree | 188d9445f4e610b2a6e05b6af667ab47d38e65a2 /indra/llcharacter/llvisualparam.cpp | |
| parent | c3b2f98012a32c0f241b814a27113e756961778c (diff) | |
| parent | 5c4ec60c966bd1857fb195f73d2d09117b783f9a (diff) | |
branch merge
Diffstat (limited to 'indra/llcharacter/llvisualparam.cpp')
| -rw-r--r-- | indra/llcharacter/llvisualparam.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/llcharacter/llvisualparam.cpp b/indra/llcharacter/llvisualparam.cpp index 9e4957342c..6232c7588b 100644 --- a/indra/llcharacter/llvisualparam.cpp +++ b/indra/llcharacter/llvisualparam.cpp @@ -173,7 +173,8 @@ LLVisualParam::LLVisualParam() mTargetWeight( 0.f ), mIsAnimating( FALSE ), mID( -1 ), - mInfo( 0 ) + mInfo( 0 ), + mIsDummy(FALSE) { } @@ -251,6 +252,13 @@ void LLVisualParam::setWeight(F32 weight, BOOL set_by_user) //----------------------------------------------------------------------------- void LLVisualParam::setAnimationTarget(F32 target_value, BOOL set_by_user) { + // don't animate dummy parameters + if (mIsDummy) + { + setWeight(target_value, set_by_user); + return; + } + if (mInfo) { if (getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE) |