diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-12-21 10:38:08 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-12-21 10:38:08 -0500 |
commit | e0d77c277a46fa1161505a177e99b456854a98fd (patch) | |
tree | 9c0bb28f90368e34fb907950ca54b94df85b5fa2 /indra/llcommon/llthread.cpp | |
parent | c87142e5d779fb3d5375842658a63a1af2573094 (diff) | |
parent | e7f3f3bdbbec310030209e09d389cd434adb7991 (diff) |
Automated merge from mesh-development
Diffstat (limited to 'indra/llcommon/llthread.cpp')
-rw-r--r-- | indra/llcommon/llthread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index f0b7ac5def..b4617c5453 100644 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -62,7 +62,7 @@ U32 ll_thread_local sThreadID = 0; U32 LLThread::sIDIter = 0; -void assert_main_thread() +LL_COMMON_API void assert_main_thread() { static U32 s_thread_id = LLThread::currentID(); if (LLThread::currentID() != s_thread_id) |