diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-05 15:10:31 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-05 15:10:31 -0500 |
| commit | df1c6d2a2e4ccfe7bd19a66ba95c4f7bc6edee5e (patch) | |
| tree | 5d278369af1ba0ee4e75868b676b486009dbace2 /indra/llcommon/llfasttimer_class.h | |
| parent | 02783213455418a509994df16f9250b05753c183 (diff) | |
| parent | dfddccd65da32ac2c11c9106c3995a3281d7c30d (diff) | |
Automated merge from mesh-development
Diffstat (limited to 'indra/llcommon/llfasttimer_class.h')
| -rw-r--r-- | indra/llcommon/llfasttimer_class.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcommon/llfasttimer_class.h b/indra/llcommon/llfasttimer_class.h index 038a2d246a..827747f0c6 100644 --- a/indra/llcommon/llfasttimer_class.h +++ b/indra/llcommon/llfasttimer_class.h @@ -180,8 +180,10 @@ public: sTimerCycles += timer_end - timer_start; #endif #if DEBUG_FAST_TIMER_THREADS +#if !LL_RELEASE assert_main_thread(); #endif +#endif } LL_FORCE_INLINE ~LLFastTimer() @@ -251,6 +253,7 @@ public: U32 mChildTime; }; static CurTimerData sCurTimerData; + static std::string sClockType; private: static U32 getCPUClockCount32(); |