diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-07-30 14:57:33 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-07-30 14:57:33 -0400 |
| commit | a5c9d89b28d74c1996a0c950a0c8b1484b43d243 (patch) | |
| tree | afd2dc64d86c69390fe2f482870fae0b097b768a /indra/newview/llviewertexturelist.h | |
| parent | 0f3c5e6458acdf1676f0b7a6dc42ed8cfa286cb0 (diff) | |
| parent | d306cb059b9b56c1eb051074e19796b47e1c262d (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewertexturelist.h')
| -rw-r--r-- | indra/newview/llviewertexturelist.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h index e89997fe28..3dda973d3f 100644 --- a/indra/newview/llviewertexturelist.h +++ b/indra/newview/llviewertexturelist.h @@ -111,6 +111,7 @@ public: void doPrefetchImages(); void clearFetchingRequests(); + void setDebugFetching(LLViewerFetchedTexture* tex, S32 debug_level); static S32 getMinVideoRamSetting(); static S32 getMaxVideoRamSetting(bool get_recommended = false); @@ -120,6 +121,7 @@ private: F32 updateImagesCreateTextures(F32 max_time); F32 updateImagesFetchTextures(F32 max_time); void updateImagesUpdateStats(); + F32 updateImagesLoadingFastCache(F32 max_time); void addImage(LLViewerFetchedTexture *image); void deleteImage(LLViewerFetchedTexture *image); @@ -173,6 +175,7 @@ public: image_list_t mLoadingStreamList; image_list_t mCreateTextureList; image_list_t mCallbackList; + image_list_t mFastCacheList; // Note: just raw pointers because they are never referenced, just compared against std::set<LLViewerFetchedTexture*> mDirtyTextureList; |