diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-05-17 13:41:05 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-05-17 13:41:05 -0500 |
| commit | a2e418f250c49de9aba943a62f92189fcef6220a (patch) | |
| tree | 3993a02eff77b05f280f6e474c3c68dab624a3b1 /indra/newview/lltexturecache.cpp | |
| parent | 6f5f16e0319bde183534a779839299dca7fe50ab (diff) | |
| parent | 2f44377b3e98d60f1bd5b1a495c9a3aab9cfa450 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/lltexturecache.cpp')
| -rw-r--r-- | indra/newview/lltexturecache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp index d873f5524f..a14d4f7a30 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -819,13 +819,13 @@ LLTextureCache::~LLTextureCache() ////////////////////////////////////////////////////////////////////////////// //virtual -S32 LLTextureCache::update(F32 max_time_ms) +size_t LLTextureCache::update(F32 max_time_ms) { LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE; 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(); |