diff options
Diffstat (limited to 'indra/newview/llviewertexturelist.h')
-rwxr-xr-x | indra/newview/llviewertexturelist.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h index b1b6f4d2aa..9f94f2f1bc 100755 --- a/indra/newview/llviewertexturelist.h +++ b/indra/newview/llviewertexturelist.h @@ -59,12 +59,18 @@ typedef void (*LLImageCallback)(BOOL success, BOOL final, void* userdata); +enum ETexListType +{ + TEX_LIST_DISCARD = 0, + TEX_LIST_UI +}; + struct LLTextureKey { LLTextureKey(); - LLTextureKey(LLUUID id, bool is_ui); + LLTextureKey(LLUUID id, ETexListType tex_type); LLUUID textureId; - bool isUI; + ETexListType textureType; friend bool operator<(const LLTextureKey& key1, const LLTextureKey& key2) { @@ -74,7 +80,7 @@ struct LLTextureKey } else { - return key1.isUI < key2.isUI; + return key1.textureType < key2.textureType; } } }; @@ -104,7 +110,7 @@ public: BOOL isInitialized() const {return mInitialized;} void findTexturesByID(const LLUUID &image_id, std::vector<LLViewerFetchedTexture*> &output); - LLViewerFetchedTexture *findImage(const LLUUID &image_id, bool is_ui); + LLViewerFetchedTexture *findImage(const LLUUID &image_id, ETexListType tex_type); LLViewerFetchedTexture *findImage(const LLTextureKey &search_key); void dirtyImage(LLViewerFetchedTexture *image); @@ -142,7 +148,7 @@ private: void updateImagesUpdateStats(); F32 updateImagesLoadingFastCache(F32 max_time); - void addImage(LLViewerFetchedTexture *image, bool add_ui); + void addImage(LLViewerFetchedTexture *image, ETexListType tex_type); void deleteImage(LLViewerFetchedTexture *image); void addImageToList(LLViewerFetchedTexture *image); |