From d48889198b9f5b39c195e237ae253339b2d89ef3 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 30 Aug 2012 19:23:17 -0700
Subject: [PATCH] MAINT-1486 FIX Crash on login (Unhandled exception) open root
timer by default
---
indra/llcommon/llfasttimer.cpp | 1 +
indra/newview/llappviewer.cpp | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp
index d54e1a93ea9..6970c290924 100644
--- a/indra/llcommon/llfasttimer.cpp
+++ b/indra/llcommon/llfasttimer.cpp
@@ -116,6 +116,7 @@ class NamedTimerFactory : public LLSingleton<NamedTimerFactory>
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 bf01627bada..a8763aae0cd 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()
{
--
GitLab