diff options
author | Dave Parks <davep@lindenlab.com> | 2012-04-13 14:47:30 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-04-13 14:47:30 -0500 |
commit | 6a0eaab160474ea747a33aea107fc3a400bece07 (patch) | |
tree | da04435b8e62d3faeaaea0cbd6eb2fc0eb0ee65e /indra | |
parent | b2999c50890c22eac950bcec0f05ad20b4b01f49 (diff) |
MAINT-871 Fix for freeze on shutdown while calculating weights and fees of a mesh.
Diffstat (limited to 'indra')
-rwxr-xr-x | indra/newview/llmeshrepository.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index c899e8991e..bc7f522848 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -1659,7 +1659,7 @@ void LLMeshUploadThread::requestWholeModelFee() mCurlRequest->process(); //sleep for 10ms to prevent eating a whole core apr_sleep(10000); - } while (mCurlRequest->getQueued() > 0); + } while (!LLApp::isQuitting() && mCurlRequest->getQueued() > 0); delete mCurlRequest; mCurlRequest = NULL; |