diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 09:27:10 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 09:27:10 -0800 |
commit | 270629a3fe453e75c0ffeb780419ad3e27eeaa34 (patch) | |
tree | 5bb2f6f3e6871bc0285ed5b34a0166fd25074d68 /indra/llcharacter | |
parent | a0bbe8d8eb98aaba1dc55c7cbcb70d58125781ce (diff) | |
parent | 6f6d1314e6f1fe12391391172bffa52c9c08e380 (diff) |
merge from remote repo
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 |