From 894971c7b304a23d37fbfccbaaa1d75a93e01456 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 12 Oct 2010 15:08:01 -0500
Subject: SH-302 Fix for crash when uploading models with hundreds of meshes.

---
 indra/newview/llmeshrepository.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'indra/newview')

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")
 			{
-- 
cgit v1.2.3