diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-10-04 09:19:25 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-10-04 09:19:25 -0700 |
| commit | c2c060d4401d3a79a9ae0076af0c9b86d14f7f37 (patch) | |
| tree | b7efcf3c2e38aa9de488342b3379b4bde0a6bc47 /indra/llcommon/llfasttimer.cpp | |
| parent | d44c85c6dc575c0c67019ce1bffecfaa5bc275d1 (diff) | |
| parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) | |
Merge with 3.6.7
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() |