From 3157e95b47cacbda769b8eda3f64c68ce666b4d3 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 20 Jul 2020 17:24:14 -0400
Subject: [PATCH] Really make sure main thread vars are initialized

---
 indra/llcommon/llapp.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
index 3dab632aefa..7549ea45ac4 100644
--- a/indra/llcommon/llapp.cpp
+++ b/indra/llcommon/llapp.cpp
@@ -125,6 +125,9 @@ LLApp::LLApp() : mThreadErrorp(NULL)
 
 void LLApp::commonCtor()
 {
+	assert_main_thread();		// Make sure we record the main thread
+	on_main_thread();			// Make sure we record the main thread
+
 	// Set our status to running
 	setStatus(APP_STATUS_RUNNING);
 
-- 
GitLab