summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-12-17 14:13:07 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-12-17 14:13:07 -0500
commit9a8dbb852056834ebdbea23d8475a4ec4b685549 (patch)
tree4e87d857640ae6f6885a6dc0d9db0faf46b82e2f /indra
parentad625861e120cae967d6bc60a9c1f4d86f4c2ed1 (diff)
SH-682 WIP: allow DEBUG_FAST_TIMER_THREADS to work when enabled
Diffstat (limited to 'indra')
-rwxr-xr-x[-rw-r--r--]indra/llcommon/llfasttimer_class.h2
-rwxr-xr-x[-rw-r--r--]indra/llcommon/llthread.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llfasttimer_class.h b/indra/llcommon/llfasttimer_class.h
index 2a645315c9..4e59d4ab9d 100644..100755
--- a/indra/llcommon/llfasttimer_class.h
+++ b/indra/llcommon/llfasttimer_class.h
@@ -39,7 +39,7 @@ class LLMutex;
#include "llsd.h"
#if DEBUG_FAST_TIMER_THREADS
-void assert_main_thread();
+LL_COMMON_API void assert_main_thread();
#endif
class LL_COMMON_API LLFastTimer
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
index f0b7ac5def..b4617c5453 100644..100755
--- 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)