diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-05-23 16:56:06 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-05-23 16:56:06 -0400 |
| commit | 0ef13640636bf8dbc252b9b4ee3849ccc0d2148c (patch) | |
| tree | feb96c467e57199bee1a3c28f1f5af0cd0a2353d | |
| parent | 294c5f3d3a29f1d52b587b9b1750b65238ca2dee (diff) | |
STORM-1275 FIX viewer gets caught in infinite loop for decompstub
Fixed setting the initialized flag for the decomposition stub case
(for OS builds) so that the viewer doesn't hang when initializing the stub.
Note that initialized will be set to true even when instance will return NULL.
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index f06c5dcd64..0b96a3b34f 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -3667,6 +3667,9 @@ void LLPhysicsDecomp::run() LLConvexDecomposition* decomp = LLConvexDecomposition::getInstance(); if (decomp == NULL) { + // stub library. Set init to true so the main thread + // doesn't wait for this to finish. + mInited = true; return; } |