diff options
author | Callum Prentice <callum@mbp.localdomain> | 2022-12-12 11:05:24 -0800 |
---|---|---|
committer | Callum Prentice <callum@mbp.localdomain> | 2022-12-12 11:05:24 -0800 |
commit | 6daa0a9ecba98fc805a3e76573c894f1d956da8a (patch) | |
tree | 8dd833707caf512e580cbe8f2a265d4367103894 /indra/newview/llviewertexturelist.h | |
parent | a849c51837c9fad2a6929564f4b3a3446a2f4e9a (diff) | |
parent | a0c3d69c620a92d73a1008f218680fb4d0ef9255 (diff) |
Merge branch 'main' into DRTVWR-489-emoji
Diffstat (limited to 'indra/newview/llviewertexturelist.h')
-rw-r--r-- | indra/newview/llviewertexturelist.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h index 6fb0d3552e..0018e78d45 100644 --- a/indra/newview/llviewertexturelist.h +++ b/indra/newview/llviewertexturelist.h @@ -98,8 +98,6 @@ public: const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT); static LLPointer<LLImageJ2C> convertToUploadFile(LLPointer<LLImageRaw> raw_image, const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT); static void processImageNotInDatabase( LLMessageSystem *msg, void **user_data ); - static void receiveImageHeader(LLMessageSystem *msg, void **user_data); - static void receiveImagePacket(LLMessageSystem *msg, void **user_data); public: LLViewerTextureList(); @@ -133,7 +131,9 @@ public: void updateMaxResidentTexMem(S32Megabytes mem); + // Local UI images void doPreloadImages(); + // Network images. Needs caps and cache to work void doPrefetchImages(); void clearFetchingRequests(); |