summaryrefslogtreecommitdiff
path: root/indra/llui/lllayoutstack.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-09-05 14:21:57 -0700
committerRichard Linden <none@none>2013-09-05 14:21:57 -0700
commit9dc6478544711b1f03c9f7010421f9c8ebbbe008 (patch)
tree1d28248570ac6e48596c787734bc39a891d9752e /indra/llui/lllayoutstack.cpp
parent736efc7b574635d5c86a97a33b456dd79a035777 (diff)
parentcbe397ad13665c7bc993e10d8fe1e4a876253378 (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llui/lllayoutstack.cpp')
-rwxr-xr-xindra/llui/lllayoutstack.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index edb32954c6..e40dcb28ef 100755
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -316,11 +316,11 @@ void LLLayoutStack::collapsePanel(LLPanel* panel, BOOL collapsed)
mNeedsLayout = true;
}
-static LLFastTimer::DeclareTimer FTM_UPDATE_LAYOUT("Update LayoutStacks");
+static LLTrace::TimeBlock FTM_UPDATE_LAYOUT("Update LayoutStacks");
void LLLayoutStack::updateLayout()
{
- LLFastTimer ft(FTM_UPDATE_LAYOUT);
+ LL_RECORD_BLOCK_TIME(FTM_UPDATE_LAYOUT);
if (!mNeedsLayout) return;