diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-03 15:13:37 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-03 15:13:37 +0200 |
| commit | a52ef7ad60c8821fcb412988d838b58c0414ac8f (patch) | |
| tree | a6fe2e267b2e7bf70d4a8d8227e1bc1f1152574d /indra/newview/llvoavatar.h | |
| parent | bc496f5f17a446af27b47cbe227e7e85089bab8d (diff) | |
| parent | 712164210cf57cfde3b17c3162dc4129d52e2780 (diff) | |
Merge branch 'DRTVWR-499' into DRTVWR-500
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index e352a6c1fa..3526142ff5 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -629,6 +629,8 @@ protected: LLLoadedCallbackEntry::source_callback_list_t mCallbackTextureList ; BOOL mLoadedCallbacksPaused; + S32 mLoadedCallbackTextures; // count of fully loaded textures filled from mCallbackTextureList + LLFrameTimer mLastTexCallbackAddedTime; std::set<LLUUID> mTextureIDs; //-------------------------------------------------------------------- // Local Textures |