diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-12 12:58:28 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-12 12:58:28 -0800 |
| commit | 0e6139eb3d3af1e77df20f87deef427993bf2c61 (patch) | |
| tree | 2c93f9a8d69f28cec99393b3cacbab85a8aa073d /indra/newview/llviewertexturelist.h | |
| parent | 6f53b5baeb9e04c20c8fe6f419e09c9604a56497 (diff) | |
| parent | 7833ecb58094641d3cd79c6772ad6c9fd4799f92 (diff) | |
merging in latest changes
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; |