diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-12-12 17:44:47 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-12-12 17:44:47 +0200 |
| commit | 2b7ba3f90455d675770e68f7e338d39053a343b9 (patch) | |
| tree | 652c664acf1d848e894637c47c93f9aa17289954 /indra/newview/lltexturecache.cpp | |
| parent | 80e39507810ea0d5e9931bea79e0bfda3e77ab9e (diff) | |
| parent | 7d9249d180f7bc228cad3d6f5ed4d5fb13296451 (diff) | |
Merge branch 'xcode-14.1' into contribute
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 9403e73b87..67da311493 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -859,12 +859,12 @@ LLTextureCache::~LLTextureCache() ////////////////////////////////////////////////////////////////////////////// //virtual -S32 LLTextureCache::update(F32 max_time_ms) +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(); |