diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-10-12 15:08:01 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-10-12 15:08:01 -0500 |
| commit | 894971c7b304a23d37fbfccbaaa1d75a93e01456 (patch) | |
| tree | 320c597978b5814a9393f462a89d33ab20182f31 /indra/newview | |
| parent | 93dc8f09ea5f44bb5bdd73a469c984cf7d714149 (diff) | |
SH-302 Fix for crash when uploading models with hundreds of meshes.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 9 |
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") { |