diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-22 15:53:28 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-22 15:53:28 -0400 |
| commit | ba4c4bcbd19750c8b5a8ff88c9e410dbfef16fbd (patch) | |
| tree | a274fae3ed2956dcb95ed16927be207cb12c593a /indra/newview/llmeshrepository.cpp | |
| parent | d912f24cb0cea21ce05a127824abb6a2c55231de (diff) | |
| parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) | |
merge
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -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; |