diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-05-22 10:42:18 -0700 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-05-22 10:42:18 -0700 |
| commit | b273edd1253e088ea864d399342a0cba2fd0aaa9 (patch) | |
| tree | 317ff7c05eacccb80b3fe06d65d8f64d7ff6019d /indra/llimage | |
| parent | da72081582c3fd376e228cf0fceaef2ecb1948a9 (diff) | |
| parent | c6fc951f34c665d0f1cd6dcff1bea114fb0ff1a0 (diff) | |
Merge branch 'DRTVWR-559' into DRTVWR-583
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: |