diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2022-11-13 05:59:40 -1000 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2022-11-13 05:59:40 -1000 |
| commit | 690a5027fb1760c31a72cc1c2fb44ae41ab340d2 (patch) | |
| tree | 881a4c5cb3a6508d437049ecffe66f78b73446a7 /indra/newview | |
| parent | 4349cb6165e983ff6bdd45ad1b82bb98bfc0436f (diff) | |
| parent | 076737cb6c28e9e5ea47cd4cb6ea9c5c514e578b (diff) | |
DRTVWR-575: Merge brad's xcode-14.1 fixes with nat's
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lltexturecache.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/lltexturecache.h | 2 | ||||
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp index cabc3a3517..67da311493 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -864,7 +864,7 @@ size_t LLTextureCache::update(F32 max_time_ms) static LLFrameTimer timer ; static const F32 MAX_TIME_INTERVAL = 300.f ; //seconds. - S32 res; + size_t res; res = LLWorkerThread::update(max_time_ms); mListMutex.lock(); diff --git a/indra/newview/lltexturecache.h b/indra/newview/lltexturecache.h index e6437ef5ea..b6ace467c7 100644 --- a/indra/newview/lltexturecache.h +++ b/indra/newview/lltexturecache.h @@ -113,7 +113,7 @@ public: LLTextureCache(bool threaded); ~LLTextureCache(); - /*virtual*/ size_t update(F32 max_time_ms); + /*virtual*/ size_t update(F32 max_time_ms); void purgeCache(ELLPath location, bool remove_dir = true); void setReadOnly(BOOL read_only) ; diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 8cd6ccba85..8923f53cf5 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -3195,7 +3195,7 @@ size_t LLTextureFetch::update(F32 max_time_ms) mNetworkQueueMutex.unlock(); // -Mfnq } - S32 res = LLWorkerThread::update(max_time_ms); + size_t res = LLWorkerThread::update(max_time_ms); if (!mDebugPause) { |