diff options
author | Don Kjer <don@lindenlab.com> | 2012-10-04 03:13:14 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2012-10-04 03:13:14 +0000 |
commit | 6d613b61d76c1909021983901920b6b1dc2c80f4 (patch) | |
tree | ade650a2b4b5aa37a549fc90c106f128f7095cc6 /indra/llcharacter | |
parent | c9ab9590aa1d44ea139b16e7ffcb1461d928bdd5 (diff) | |
parent | 13d6a9920d06bd718b632c0980f8340909b8187c (diff) |
Automated merge
Diffstat (limited to 'indra/llcharacter')
-rw-r--r-- | indra/llcharacter/llvisualparam.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcharacter/llvisualparam.cpp b/indra/llcharacter/llvisualparam.cpp index 809b312abe..255f61b1b3 100644 --- a/indra/llcharacter/llvisualparam.cpp +++ b/indra/llcharacter/llvisualparam.cpp @@ -250,6 +250,7 @@ void LLVisualParam::setAnimationTarget(F32 target_value, BOOL upload_bake) if (mIsDummy) { setWeight(target_value, upload_bake); + mTargetWeight = mCurWeight; return; } |