diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-03-01 16:37:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-01 16:37:59 -0500 |
| commit | 5d78ff48cb1f916180a2ffd10989eae50b81b4ec (patch) | |
| tree | eb1f22ba21082efbb023b1b85468ed7923d519fb /indra/newview/llmeshrepository.h | |
| parent | 5aa359ed8d4d36e45c562cf56cb69580dc4236b4 (diff) | |
| parent | 42ceac9695f7e098f15264977396a939c8ddfd23 (diff) | |
Merge pull request #3634 from secondlife/release/2024.12-ForeverFPS
Update develop with ForeverFPS
Diffstat (limited to 'indra/newview/llmeshrepository.h')
| -rw-r--r-- | indra/newview/llmeshrepository.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index b5c2424578..3d25a4dd78 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -256,8 +256,8 @@ class LLMeshRepoThread : public LLThread { public: - volatile static S32 sActiveHeaderRequests; - volatile static S32 sActiveLODRequests; + static std::atomic<S32> sActiveHeaderRequests; + static std::atomic<S32> sActiveLODRequests; static U32 sMaxConcurrentRequests; static S32 sRequestLowWater; static S32 sRequestHighWater; |