summaryrefslogtreecommitdiff
path: root/indra/llcommon/llcommon.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-09-26 11:44:40 -0700
committerGraham Linden <graham@lindenlab.com>2013-09-26 11:44:40 -0700
commit0103cac1ddda96fd470238d2c8b73c2cf55b6c12 (patch)
treea485d28fd9861c41bf9b7117c085bd84617f43de /indra/llcommon/llcommon.cpp
parentdd4beb695a9c800b37b7c9a19d3ac3f4456012f5 (diff)
parentbadb8a945d31aed6f396e7efb521e76083870069 (diff)
Merge viewer-bear maint RC changes to get this build closer to the RC it will follow
Diffstat (limited to 'indra/llcommon/llcommon.cpp')
-rwxr-xr-xindra/llcommon/llcommon.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp
index 8be9e4f4de..b938b0e65a 100755
--- a/indra/llcommon/llcommon.cpp
+++ b/indra/llcommon/llcommon.cpp
@@ -44,6 +44,7 @@ void LLCommon::initClass()
}
LLTimer::initClass();
LLThreadSafeRefCount::initThreadSafeRefCount();
+ assert_main_thread(); // Make sure we record the main thread
// LLWorkerThread::initClass();
// LLFrameCallbackManager::initClass();
}