diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-10-24 12:21:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-24 12:21:13 -0400 |
| commit | b611324db58def7d65f4bfc721e7dc1c378b7fa3 (patch) | |
| tree | 22074ffb1c262b9ffbb458a2836405e5c086ce7d /indra/newview/lltexturefetch.cpp | |
| parent | 299c37adaec5cf33981cbbaa3c25c68152b14725 (diff) | |
| parent | 168a5f36b92f5cbc3d83248fb5ffbb47a3b7e223 (diff) | |
Merge pull request #2585 from secondlife/marchcat/xcode-16
Xcode16 build fix
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index ed91214bd0..7b6f591254 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -2832,7 +2832,7 @@ bool LLTextureFetch::getRequestFinished(const LLUUID& id, S32& discard_level, bool LLTextureFetch::updateRequestPriority(const LLUUID& id, F32 priority) { LL_PROFILE_ZONE_SCOPED; - mRequestQueue.tryPost([=]() + mRequestQueue.tryPost([=, this]() { LLTextureFetchWorker* worker = getWorker(id); if (worker) @@ -3523,8 +3523,8 @@ TFReqSendMetrics::doWork(LLTextureFetch * fetcher) //if (! gViewerAssetStatsThread1) // return true; - static volatile bool reporting_started(false); - static volatile S32 report_sequence(0); + static std::atomic<bool> reporting_started(false); + static std::atomic<S32> report_sequence(0); // In mStatsSD, we have a copy we own of the LLSD representation // of the asset stats. Add some additional fields and ship it off. |