diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-04-09 12:21:38 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-04-09 12:21:38 -0500 |
| commit | d8b80cdbb635360d36fb374b76edc5d7ab32fad8 (patch) | |
| tree | 97e9d416d14fe5667b068f58a7155339dd9c2ffd | |
| parent | 823a52756a78598cc32efac53d9adb8c760b99e9 (diff) | |
MAINT-890 Fix for freeze on exit when a mesh upload is pending.
| -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 f461c7e46f..c899e8991e 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -1620,7 +1620,7 @@ void LLMeshUploadThread::doWholeModelUpload() mCurlRequest->process(); //sleep for 10ms to prevent eating a whole core apr_sleep(10000); - } while (mCurlRequest->getQueued() > 0); + } while (!LLAppViewer::isQuitting() && mCurlRequest->getQueued() > 0); } delete mCurlRequest; |