diff options
| author | Palmer <palmer@lindenlab.com> | 2009-11-04 17:04:17 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-11-04 17:04:17 -0800 |
| commit | d5cceb9d2f05ba4e19da3cc50ef273aa4dffc453 (patch) | |
| tree | de0a6cf70ec27964f2b08040c9f217114bd49fa4 /indra/llcharacter | |
| parent | c4817c4e5856577ff56f34ba48e12cef5ee7ab6d (diff) | |
| parent | 71dc13aac99458989776e93c38294f507074fce4 (diff) | |
Almost automated merge
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 |