diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-03 12:20:14 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-03 12:20:14 -0500 |
| commit | 1972a095ddbed84415d315fa3bed731303a27cd8 (patch) | |
| tree | c38df4ec40839d5fce4f6dacf0b309fa0dcea3f3 /indra/llcharacter | |
| parent | c9d121dd01625790cb963372c861f8e4072430d2 (diff) | |
| parent | a100a6e07f8b6ea16313e25e3249736228d9b03c (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 |