diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-02 09:54:52 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-02 09:54:52 -0800 |
| commit | 9ed8b5299f2e5a8a912649e0e6aecaf89b034408 (patch) | |
| tree | e7c9ecc91fbbef0c26fd352f2743ac050d8f889e /indra/llcharacter/llvisualparam.cpp | |
| parent | 55731ee318e6e3c2e9998c6347cbd9d3635115c4 (diff) | |
| parent | 3783852444825edf420e6109927df21fd004c3e7 (diff) | |
Merge from remote repo
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) |