diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2023-05-19 17:21:51 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2023-05-19 17:21:51 -0400 |
commit | 84278d0d2c404a02c6292a6d99f38a88e77a6490 (patch) | |
tree | bd961ca166a22cc7c6a5e65da585ea0f705dda9d /indra/llimage | |
parent | 22a07b1121bb429e6bfe10b5a5e859bcea1262b6 (diff) | |
parent | a92f08b2bc0ee5a63f678c55f9a9d0ec0c4ff574 (diff) |
SL-18837: Merge branch 'xcode-14.1' of secondlife/viewer into xcode-14.3
Diffstat (limited to 'indra/llimage')
-rw-r--r-- | indra/llimage/llimageworker.cpp | 2 | ||||
-rw-r--r-- | indra/llimage/llimageworker.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp index 0dbb744bcf..ff4336d2de 100644 --- a/indra/llimage/llimageworker.cpp +++ b/indra/llimage/llimageworker.cpp @@ -46,7 +46,7 @@ LLImageDecodeThread::~LLImageDecodeThread() // MAIN THREAD // virtual -S32 LLImageDecodeThread::update(F32 max_time_ms) +size_t LLImageDecodeThread::update(F32 max_time_ms) { LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE; LLMutexLock lock(mCreationMutex); diff --git a/indra/llimage/llimageworker.h b/indra/llimage/llimageworker.h index 1bfb0ddfd3..54814c24c5 100644 --- a/indra/llimage/llimageworker.h +++ b/indra/llimage/llimageworker.h @@ -78,7 +78,7 @@ public: handle_t decodeImage(LLImageFormatted* image, U32 priority, S32 discard, BOOL needs_aux, Responder* responder); - S32 update(F32 max_time_ms); + size_t update(F32 max_time_ms); // Used by unit tests to check the consistency of the thread instance S32 tut_size(); |