summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llmeshrepository.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 0af885068e..77f89b01b3 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -2762,8 +2762,6 @@ void LLPhysicsDecomp::submitRequest(LLPhysicsDecomp::Request* request)
LLMutexLock lock(mMutex);
mRequestQ.push(request);
mSignal->signal();
-
-
}
//static
@@ -3074,8 +3072,11 @@ void LLPhysicsDecomp::run()
mSignal->wait();
while (!mQuitting && !mRequestQ.empty())
{
- mCurRequest = mRequestQ.front();
- mRequestQ.pop();
+ {
+ LLMutexLock lock(mMutex);
+ mCurRequest = mRequestQ.front();
+ mRequestQ.pop();
+ }
if (mCurRequest->mStage == "single_hull")
{