diff options
| author | Richard Linden <none@none> | 2013-09-07 21:54:03 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-07 21:54:03 -0700 |
| commit | c6b6ae7a45f7ab473dd839515a1717bae68af03a (patch) | |
| tree | 74bc548852a9ea3cf350096b55182761362a3f6d /indra/llui/llview.cpp | |
| parent | 3fd68662f267a3fd96d101834b3a9563bde3f61e (diff) | |
| parent | e4cacda5a0cf3918bdc8091997b988235e9d4f3d (diff) | |
merge
Diffstat (limited to 'indra/llui/llview.cpp')
| -rwxr-xr-x | indra/llui/llview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index ae62d72f73..22461083a6 100755 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -69,7 +69,7 @@ LLView* LLView::sPreviewClickedElement = NULL; BOOL LLView::sDrawPreviewHighlights = FALSE; S32 LLView::sLastLeftXML = S32_MIN; S32 LLView::sLastBottomXML = S32_MIN; -LLTrace::MemStatHandle LLView::sMemStat("LLView"); +//LLTrace::MemStatHandle LLView::sMemStat("LLView"); std::vector<LLViewDrawContext*> LLViewDrawContext::sDrawContextStack; LLView::DrilldownFunc LLView::sDrilldown = @@ -1504,11 +1504,11 @@ LLView* LLView::getChildView(const std::string& name, BOOL recurse) const return getChild<LLView>(name, recurse); } -static LLFastTimer::DeclareTimer FTM_FIND_VIEWS("Find Widgets"); +static LLTrace::TimeBlock FTM_FIND_VIEWS("Find Widgets"); LLView* LLView::findChildView(const std::string& name, BOOL recurse) const { - LLFastTimer ft(FTM_FIND_VIEWS); + LL_RECORD_BLOCK_TIME(FTM_FIND_VIEWS); //richard: should we allow empty names? //if(name.empty()) // return NULL; |