diff options
| author | JJ Linden <jj@lindenlab.com> | 2013-05-15 14:57:56 -0700 |
|---|---|---|
| committer | JJ Linden <jj@lindenlab.com> | 2013-05-15 14:57:56 -0700 |
| commit | a606a1cd68bd858c711856702185ae11194c6311 (patch) | |
| tree | 2c060215b7ddc02492d715cae6b48d5f3c26f335 /indra/llcommon/llfasttimer.cpp | |
| parent | 435bda9df464ef7faaf8329ffa094dca9e82a6a4 (diff) | |
| parent | 50e3b7da42ddbae409f0a2bdbc322da96941fa07 (diff) | |
merged in branch for changing BuildParams
Diffstat (limited to 'indra/llcommon/llfasttimer.cpp')
| -rwxr-xr-x[-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..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() |