diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-10-29 15:17:39 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-10-29 15:17:39 -0400 |
| commit | 1c0faee6e7711dcf0c8a13e4dbc5f75e95b1bf4d (patch) | |
| tree | f86343eebe9bac35eb2ba21c4a4e5b8d51a79903 /indra/llcharacter/llvisualparam.cpp | |
| parent | d28e37b9fc0413a24e75a2a7c78a109abbe67330 (diff) | |
| parent | 011f3786b34904d2197817151600dd876679dbbe (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
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) |