diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-05 16:47:38 -0800 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-05 16:47:38 -0800 |
commit | 91b2ff00ae874f938919373c0db3de0721c7bf25 (patch) | |
tree | e0c4c8e11cd4a158c1f7d53fea7434eee3781d97 /indra/llcommon/llfasttimer_class.cpp | |
parent | 617a7a0ebdd47aeea578456f4ed0d91ab8582a0b (diff) | |
parent | 68ea862c96a96be631505e88ae870d6aab066eb9 (diff) |
Merge
Diffstat (limited to 'indra/llcommon/llfasttimer_class.cpp')
-rw-r--r-- | indra/llcommon/llfasttimer_class.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llcommon/llfasttimer_class.cpp b/indra/llcommon/llfasttimer_class.cpp index fae0a66873..6d8d81e114 100644 --- a/indra/llcommon/llfasttimer_class.cpp +++ b/indra/llcommon/llfasttimer_class.cpp @@ -114,7 +114,11 @@ static timer_tree_dfs_iterator_t end_timer_tree() class NamedTimerFactory : public LLSingleton<NamedTimerFactory> { public: - NamedTimerFactory() + NamedTimerFactory() + : mActiveTimerRoot(NULL), + mTimerRoot(NULL), + mAppTimer(NULL), + mRootFrameState(NULL) {} /*virtual */ void initSingleton() |