summaryrefslogtreecommitdiff
path: root/indra/llcommon/llcommon.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-10-04 11:27:59 -0700
committerMerov Linden <merov@lindenlab.com>2013-10-04 11:27:59 -0700
commit98a89748789034a53f129e19d06649d79b384c52 (patch)
tree39a1aefb35402db02c8791bc3e5735c36116f426 /indra/llcommon/llcommon.cpp
parent796be733b374beb5660ee2713fc28c4e69331cbd (diff)
parent1e32b9dd33fb9e2f0d9a7935a3696b423a191354 (diff)
Pull merge from viewer-fbc
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();
}