diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
index 3dab632aefab6707c64a352cc84fca48679e7420..7549ea45ac45e17e777822d828c3d571fd786a3e 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);