diff options
author | Erik Kundiman <erik@megapahit.org> | 2025-03-22 12:29:32 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2025-03-22 12:29:32 +0800 |
commit | 53ff8ab675b76f84154cd639fe4fb5f8c0ac3dc7 (patch) | |
tree | fae2f97053a1ce15ade8eeecbf6b1e789f4b8498 /indra/newview/llmeshrepository.cpp | |
parent | 2fb48eb9be6df00c3baed955fd84f4d8a1ea1d9a (diff) | |
parent | 0ec9bfaabde12d82ba6b840589f849b7cf279417 (diff) |
Merge tag 'Second_Life_Release#0ec9bfaa-2025.03' into 2025.03
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
-rw-r--r-- | indra/newview/llmeshrepository.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index e1fa84b4d8..a8c6f69425 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -4573,6 +4573,8 @@ void LLMeshRepository::notifyLoadedMeshes() std::partial_sort(mPendingRequests.begin(), mPendingRequests.begin() + push_count, mPendingRequests.end(), PendingRequestBase::CompareScoreGreater()); } + LLMutexTrylock lock3(mThread->mHeaderMutex); + LLMutexTrylock lock4(mThread->mPendingMutex); while (!mPendingRequests.empty() && push_count > 0) { std::unique_ptr<PendingRequestBase>& req_p = mPendingRequests.front(); |