diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-04 09:54:07 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-04 09:54:07 -0500 |
| commit | 8066f4868584ebbef6512006ffc07b158f382799 (patch) | |
| tree | 04b77c72f11d6b5cfea775880eb2af0f610f2408 /indra/llcharacter | |
| parent | c10a40e54ea32825f46f91525814c19f1cb818e6 (diff) | |
| parent | 826f3aa57aa0679aeb895a7145f7b406a8a1ff4e (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
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 |