From 0ef13640636bf8dbc252b9b4ee3849ccc0d2148c Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Mon, 23 May 2011 16:56:06 -0400
Subject: [PATCH] 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.
---
indra/newview/llmeshrepository.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index f06c5dcd641..0b96a3b34f1 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;
}
--
GitLab