From cc468063114ff4cb8fa8b449176f4413cbcc1b60 Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 20 Feb 2020 18:54:48 +0100 Subject: [PATCH] Avoid startup deadlocks by removing logging from error thread. --- indra/llcommon/llerrorthread.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/llcommon/llerrorthread.cpp b/indra/llcommon/llerrorthread.cpp index f6bc68b5c1..221ccf9811 100644 --- a/indra/llcommon/llerrorthread.cpp +++ b/indra/llcommon/llerrorthread.cpp @@ -106,7 +106,9 @@ void LLErrorThread::run() // This thread sits and waits for the sole purpose // of waiting for the signal/exception handlers to flag the // application state as APP_STATUS_ERROR. - LL_INFOS() << "thread_error - Waiting for an error" << LL_ENDL; + + // Do not log as this can lead to deadlocks during startup. + // LL_INFOS() << "thread_error - Waiting for an error" << LL_ENDL; S32 counter = 0; while (! (LLApp::isError() || LLApp::isStopped()))