diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-10-08 00:11:22 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-10-08 00:11:22 -0500 |
| commit | 93dc8f09ea5f44bb5bdd73a469c984cf7d714149 (patch) | |
| tree | fbad294ecfd29074ee89d1dc38fcfc51468e11cc /indra/newview/llmeshrepository.cpp | |
| parent | b6e0648af78e478348451db72b9acab40bd4fc34 (diff) | |
Fix for bad labels on physics shape in importer.
Fix for crash due to race condition when uploading meshes.
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 15e4149e5d..0af885068e 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -1334,6 +1334,11 @@ void LLMeshUploadThread::run() gMeshRepo.mDecompThread->submitRequest(request); } + while (!mPhysicsComplete) + { + apr_sleep(100); + } + //upload textures bool done = false; do |