diff options
| author | nyx@NyxTop <nyx@NyxTop> | 2009-10-29 15:13:27 -0400 |
|---|---|---|
| committer | nyx@NyxTop <nyx@NyxTop> | 2009-10-29 15:13:27 -0400 |
| commit | 65f534899740018b8efb662f8154030edb07fc0f (patch) | |
| tree | 5a9697d4fb5a6004a80545804db11c51e1bdfc4c /indra/llcharacter/llvisualparam.cpp | |
| parent | bc9808a01710ab21d60df3b6652b500f31f1c40e (diff) | |
EXT-1945 visual parameter animations broken
First round of fixes for trying to fix the visual param animations
Code reviewed by Seraph
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) |