diff options
| author | simon <none@none> | 2013-04-24 09:35:38 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-04-24 09:35:38 -0700 |
| commit | 87ba85eaabbfd5fd7ad8ca8136f4783b1d932264 (patch) | |
| tree | e35d6306aef3bfcebbbdb3112458a686e6d28aad /indra/llcommon/llfasttimer.cpp | |
| parent | de34ab57cbd29fecc29066a59869dc8cba621561 (diff) | |
diff -r 59c7bed66dfd indra/llcommon/lleventapi.h
Diffstat (limited to 'indra/llcommon/llfasttimer.cpp')
| -rw-r--r-- | 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 9b15804e97..51a9441cd5 100644 --- 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() |