diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-10-30 19:17:53 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-10-30 19:17:53 +0200 |
| commit | b2526cde2393ca7d84284b254fb4f37b9e8abb5b (patch) | |
| tree | 2318b3c35d1b673ba819794c094e6d8e4bad3500 /indra/llcharacter/llvisualparam.cpp | |
| parent | 2efd4f40af8df78d5b34c1449b1a99e3f570cae5 (diff) | |
| parent | aae05b49308d8b5d39a1b1b62f8e6145097043b6 (diff) | |
merge from default branch
--HG--
branch : product-engine
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) |