diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-04-15 15:00:13 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-04-15 15:00:13 -0400 |
| commit | 384c954fb7f6fef583998f87968c01a831911a49 (patch) | |
| tree | 8546f0e2801fabcead21062cd54326fb0792d819 /indra/newview/llvoavatar.h | |
| parent | 7c170abf52813aa45e9bee656e3b5c12d7fbf47e (diff) | |
EXT-6877 : Show avatar-as-cloud as "Loading..." in nametag
If you or others are a cloud, then your nametag will include a "(Loading...)" string.
Note: this required a small bit of code refactor so that you can query if an avatar (yourself or others) is a cloud; this was basically a rename from updateIsFullyLoaded into getIsCloud.
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; //-------------------------------------------------------------------- |