diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-02-13 19:52:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-13 19:52:12 +0200 |
| commit | 8f8453c3e859750ada26adc29ed52e3f37e013f6 (patch) | |
| tree | 17a692fecb648b9d1a4f2d7e927fc5d2ea3dedc0 /indra/newview/llmeshrepository.cpp | |
| parent | 0679cbdec89fbd3ec470768bdf469f6a1d326859 (diff) | |
| parent | d74b30b4ec3b1974ee0d781fb34b1c9518b9985d (diff) | |
Merge pull request #3549 from secondlife/marchcat/foreverfps-xcode-16
Update ForeverFPS build to use macos15/xcode16.1
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index a5bed1dbe6..93453f507c 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -548,8 +548,8 @@ LLViewerFetchedTexture* LLMeshUploadThread::FindViewerTexture(const LLImportMate return ppTex ? (*ppTex).get() : NULL; } -volatile S32 LLMeshRepoThread::sActiveHeaderRequests = 0; -volatile S32 LLMeshRepoThread::sActiveLODRequests = 0; +std::atomic<S32> LLMeshRepoThread::sActiveHeaderRequests = 0; +std::atomic<S32> LLMeshRepoThread::sActiveLODRequests = 0; U32 LLMeshRepoThread::sMaxConcurrentRequests = 1; S32 LLMeshRepoThread::sRequestLowWater = REQUEST2_LOW_WATER_MIN; S32 LLMeshRepoThread::sRequestHighWater = REQUEST2_HIGH_WATER_MIN; @@ -3916,7 +3916,7 @@ void LLMeshRepository::notifyLoadedMeshes() } // erase from background thread - mThread->mWorkQueue.post([=]() + mThread->mWorkQueue.post([=, this]() { mThread->mSkinMap.erase(id); }); |