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/llfasttimer_class.h | |
| parent | c87142e5d779fb3d5375842658a63a1af2573094 (diff) | |
| parent | e7f3f3bdbbec310030209e09d389cd434adb7991 (diff) | |
Automated merge from mesh-development
Diffstat (limited to 'indra/llcommon/llfasttimer_class.h')
| -rw-r--r-- | indra/llcommon/llfasttimer_class.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llcommon/llfasttimer_class.h b/indra/llcommon/llfasttimer_class.h index 2a645315c9..038a2d246a 100644 --- a/indra/llcommon/llfasttimer_class.h +++ b/indra/llcommon/llfasttimer_class.h @@ -31,16 +31,14 @@ #define FAST_TIMER_ON 1 #define TIME_FAST_TIMERS 0 -#define DEBUG_FAST_TIMER_THREADS 0 +#define DEBUG_FAST_TIMER_THREADS 1 class LLMutex; #include <queue> #include "llsd.h" -#if DEBUG_FAST_TIMER_THREADS -void assert_main_thread(); -#endif +LL_COMMON_API void assert_main_thread(); class LL_COMMON_API LLFastTimer { |