diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-05-06 21:00:50 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-05-06 21:00:50 +0100 |
| commit | fbd5f63f470e3cea5039b929690c9e28a137c244 (patch) | |
| tree | af6cf39af2aae68460c8d0061ff5e04c2cc50846 /indra/newview/llvoavatar.h | |
| parent | c65151b2b34e3dbc95e64bd9f4a358cad2609be4 (diff) | |
| parent | 4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff) | |
merge
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 08f7706506..ee7f3d6dca 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -349,7 +349,7 @@ public: BOOL isFullyTextured() const; BOOL hasGray() const; S32 getRezzedStatus() const; // 0 = cloud, 1 = gray, 2 = textured, 3 = textured and fully downloaded. - void updateRezzedStatusTimers(); + void updateRezzedStatusTimers(S32 status); S32 mLastRezzedStatus; @@ -661,6 +661,8 @@ protected: LLLoadedCallbackEntry::source_callback_list_t mCallbackTextureList ; BOOL mLoadedCallbacksPaused; + S32 mLoadedCallbackTextures; // count of 'loaded' baked textures, filled from mCallbackTextureList + LLFrameTimer mLastTexCallbackAddedTime; std::set<LLUUID> mTextureIDs; //-------------------------------------------------------------------- // Local Textures |