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/lltexturefetch.cpp | |
| parent | 6f5f16e0319bde183534a779839299dca7fe50ab (diff) | |
| parent | 2f44377b3e98d60f1bd5b1a495c9a3aab9cfa450 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 639e570ee7..2128b55029 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -2819,19 +2819,19 @@ bool LLTextureFetch::updateRequestPriority(const LLUUID& id, F32 priority) // Threads: T* //virtual -S32 LLTextureFetch::getPending() +size_t LLTextureFetch::getPending() { LL_PROFILE_ZONE_SCOPED; - S32 res; - lockData(); // +Ct + size_t res; + lockData(); // +Ct { LLMutexLock lock(&mQueueMutex); // +Mfq res = mRequestQueue.size(); res += mCommands.size(); } // -Mfq - unlockData(); // -Ct - return res; + unlockData(); // -Ct + return res; } // Locks: Ct @@ -2898,7 +2898,7 @@ void LLTextureFetch::commonUpdate() // Threads: Tmain //virtual -S32 LLTextureFetch::update(F32 max_time_ms) +size_t LLTextureFetch::update(F32 max_time_ms) { LL_PROFILE_ZONE_SCOPED; static LLCachedControl<F32> band_width(gSavedSettings,"ThrottleBandwidthKBPS", 3000.0); @@ -2913,7 +2913,7 @@ S32 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 (!mThreaded) { |