diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-04-16 10:40:50 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-04-16 10:40:50 -0700 |
| commit | a1a43f7942f68e75eaadaa9c5280ac196c4ed6a7 (patch) | |
| tree | fd46ccd3fe330f4bdaf6a5dec368ff2d1195899c /indra/newview/llvoavatar.h | |
| parent | 020a1b5b8a5aa09e677640491616d846c40a260e (diff) | |
| parent | 35168862f5ecc06166fbd1a9bcd601ae2abbf75b (diff) | |
Merge
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index d5485413f4..8da4c226ed 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(); @@ -258,6 +259,7 @@ private: S32 mFullyLoadedFrameCounter; LLFrameTimer mFullyLoadedTimer; LLFrameTimer mRuthTimer; + LLFrameTimer mRuthDebugTimer; // For tracking how long it takes for av to rez /** State ** ** @@ -828,6 +830,7 @@ private: BOOL mNameBusy; BOOL mNameMute; BOOL mNameAppearance; + BOOL mNameCloud; BOOL mRenderGroupTitles; //-------------------------------------------------------------------- |