From 93dc8f09ea5f44bb5bdd73a469c984cf7d714149 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Fri, 8 Oct 2010 00:11:22 -0500 Subject: Fix for bad labels on physics shape in importer. Fix for crash due to race condition when uploading meshes. --- indra/newview/llmeshrepository.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/llmeshrepository.cpp') 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 -- cgit v1.3