diff options
| author | Richard Linden <none@none> | 2012-08-30 19:23:17 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-08-30 19:23:17 -0700 |
| commit | d48889198b9f5b39c195e237ae253339b2d89ef3 (patch) | |
| tree | b9b803a0afd0e4ffec9b8a41ffb66a7160589734 /indra | |
| parent | c74d9f83a2a30ba364b983bc9e8abfd4099f6d68 (diff) | |
MAINT-1486 FIX Crash on login (Unhandled exception)
open root timer by default
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llfasttimer.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp index d54e1a93ea..6970c29092 100644 --- a/indra/llcommon/llfasttimer.cpp +++ b/indra/llcommon/llfasttimer.cpp @@ -116,6 +116,7 @@ public: mRootFrameState.setNamedTimer(mTimerRoot); mTimerRoot->setFrameState(&mRootFrameState); mTimerRoot->mParent = mTimerRoot; + mTimerRoot->setCollapsed(false); mRootFrameState.mParent = &mRootFrameState; } diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index bf01627bad..a8763aae0c 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1178,7 +1178,7 @@ static LLFastTimer::DeclareTimer FTM_SERVICE_CALLBACK("Callback"); static LLFastTimer::DeclareTimer FTM_AGENT_AUTOPILOT("Autopilot"); static LLFastTimer::DeclareTimer FTM_AGENT_UPDATE("Update"); -LLFastTimer::DeclareTimer FTM_FRAME("Frame"); +LLFastTimer::DeclareTimer FTM_FRAME("Frame", true); bool LLAppViewer::mainLoop() { |