Merge.
This commit is contained in:
@@ -353,11 +353,11 @@ void LLLayoutStack::collapsePanel(LLPanel* panel, BOOL collapsed)
|
||||
mNeedsLayout = true;
|
||||
}
|
||||
|
||||
static LLFastTimer::DeclareTimer FTM_UPDATE_LAYOUT("Update LayoutStacks");
|
||||
static LLTrace::BlockTimerStatHandle FTM_UPDATE_LAYOUT("Update LayoutStacks");
|
||||
|
||||
void LLLayoutStack::updateLayout()
|
||||
{
|
||||
LLFastTimer ft(FTM_UPDATE_LAYOUT);
|
||||
LL_RECORD_BLOCK_TIME(FTM_UPDATE_LAYOUT);
|
||||
|
||||
if (!mNeedsLayout) return;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user