diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-05-17 11:17:48 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-05-17 11:17:48 -0700 |
| commit | 2f44377b3e98d60f1bd5b1a495c9a3aab9cfa450 (patch) | |
| tree | 0c9b22edca280d8e2a2ef280360485c139c9b829 /indra/llimage | |
| parent | 4758355c599d1487c11884d3f700981e011cb7b7 (diff) | |
| parent | 5a70639b7992842a9f74ec81b11bac56608b8f2e (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
Diffstat (limited to 'indra/llimage')
| -rw-r--r-- | indra/llimage/llimageworker.cpp | 4 | ||||
| -rw-r--r-- | indra/llimage/llimageworker.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp index 520c81a8ec..c1ee052997 100644 --- a/indra/llimage/llimageworker.cpp +++ b/indra/llimage/llimageworker.cpp @@ -73,13 +73,13 @@ 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; return getPending(); } -S32 LLImageDecodeThread::getPending() +size_t LLImageDecodeThread::getPending() { return mThreadPool->getQueue().size(); } diff --git a/indra/llimage/llimageworker.h b/indra/llimage/llimageworker.h index fb35108a7a..ca4c0d93d0 100644 --- a/indra/llimage/llimageworker.h +++ b/indra/llimage/llimageworker.h @@ -51,8 +51,8 @@ public: handle_t decodeImage(const LLPointer<LLImageFormatted>& image, S32 discard, BOOL needs_aux, const LLPointer<Responder>& responder); - S32 getPending(); - S32 update(F32 max_time_ms); + size_t getPending(); + size_t update(F32 max_time_ms); void shutdown(); private: |