diff options
| author | Baker Linden <baker@lindenlab.com> | 2013-12-18 18:25:47 -0500 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2013-12-18 18:25:47 -0500 |
| commit | 3c521d8207092f1c48e158082b88c5e81cc9c440 (patch) | |
| tree | 36a18cfaed8fc4e3ee2a84604f3876832522e529 /indra/llcommon/llfasttimer.cpp | |
| parent | 74707f0057c05dc4dd439302e64fe29e8ed91a32 (diff) | |
| parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) | |
viewer-release merge
Diffstat (limited to 'indra/llcommon/llfasttimer.cpp')
| -rwxr-xr-x | indra/llcommon/llfasttimer.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp index 024fdd1b4d..01b6e60d2b 100755 --- a/indra/llcommon/llfasttimer.cpp +++ b/indra/llcommon/llfasttimer.cpp @@ -107,17 +107,13 @@ class NamedTimerFactory : public LLSingleton<NamedTimerFactory> { public: NamedTimerFactory() - : mTimerRoot(NULL) - {} - - /*virtual */ void initSingleton() + : mTimerRoot(new LLFastTimer::NamedTimer("root")) { - mTimerRoot = new LLFastTimer::NamedTimer("root"); mRootFrameState.setNamedTimer(mTimerRoot); mTimerRoot->setFrameState(&mRootFrameState); mTimerRoot->mParent = mTimerRoot; mTimerRoot->setCollapsed(false); - mRootFrameState.mParent = &mRootFrameState; + mRootFrameState.mParent = &mRootFrameState; } ~NamedTimerFactory() |