summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicky <none@none>2012-08-14 19:57:43 +0200
committerNicky <none@none>2012-08-14 19:57:43 +0200
commit944469b84f226cd96a62a9a1bb6302781000c497 (patch)
tree234195b36ca2f155163c6239c75ca40c9a1c8e22
parentf9c9a894442c7ff51255451663110a553c4c35c9 (diff)
Make sure only one thread access mPendingLOD at a time.
-rwxr-xr-xindra/newview/llmeshrepository.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index bc7f522848..52077c620f 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1097,11 +1097,13 @@ bool LLMeshRepoThread::headerReceived(const LLVolumeParams& mesh_params, U8* dat
mMeshHeader[mesh_id] = header;
}
+
+ LLMutexLock lock(mMutex); // make sure only one thread access mPendingLOD at the same time.
+
//check for pending requests
pending_lod_map::iterator iter = mPendingLOD.find(mesh_params);
if (iter != mPendingLOD.end())
{
- LLMutexLock lock(mMutex);
for (U32 i = 0; i < iter->second.size(); ++i)
{
LODRequest req(mesh_params, iter->second[i]);