diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-02 19:05:20 -0500 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-02 19:05:20 -0500 |
commit | a100a6e07f8b6ea16313e25e3249736228d9b03c (patch) | |
tree | 392ab4757e0393e244ac1532ebc97f749d64650c /indra/llcharacter | |
parent | 0284725886bd0cb446c14da4fa10b425315415c5 (diff) |
EXT-1947 EXT-1945 EXT-1919 EXT-2088 appearance edit dummy param + animation fix
Several fixes here:
1) minor rename in argument of setIsDummy
2) corrected parameter set_by_user to calls of setVisualParamWeight where we
shouldn't be animating
3) ensured finally that mIsDummy is set properly for all wearable parameters
4) ensured that mIsDUmmy is set properly for non-wearable based parameters on
your own avatar
Code reviewed by Bigpapi
Diffstat (limited to 'indra/llcharacter')
-rw-r--r-- | indra/llcharacter/llvisualparam.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcharacter/llvisualparam.h b/indra/llcharacter/llvisualparam.h index affc49debf..eec56d7844 100644 --- a/indra/llcharacter/llvisualparam.h +++ b/indra/llcharacter/llvisualparam.h @@ -151,7 +151,7 @@ public: virtual void setAnimating(BOOL is_animating) { mIsAnimating = is_animating && !mIsDummy; } BOOL getAnimating() const { return mIsAnimating; } - void setIsDummy(BOOL is_self) { mIsDummy = is_self; } + void setIsDummy(BOOL is_dummy) { mIsDummy = is_dummy; } protected: F32 mCurWeight; // current weight |