diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-15 20:35:52 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-15 20:35:52 +0100 |
| commit | 12dadac44e9d5af8728e7bedab586683b2660cb4 (patch) | |
| tree | 7cca1b6dac003313bfa20b712b8d0546e780af9d /indra/newview/llvoavatar.h | |
| parent | 0bd41cbf828181ad013964c68ab12d1f00f69bfa (diff) | |
| parent | bba063c0c19d121cbecaecee92c0894c5b83eb2b (diff) | |
merge from viewer-hotfix
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index d5485413f4..55753233b0 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -247,7 +247,8 @@ public: public: BOOL isFullyLoaded() const; protected: - virtual BOOL updateIsFullyLoaded(); + virtual BOOL getIsCloud(); + BOOL updateIsFullyLoaded(); BOOL processFullyLoadedChange(bool loading); void updateRuthTimer(bool loading); F32 calcMorphAmount(); @@ -828,6 +829,7 @@ private: BOOL mNameBusy; BOOL mNameMute; BOOL mNameAppearance; + BOOL mNameCloud; BOOL mRenderGroupTitles; //-------------------------------------------------------------------- |