diff options
| author | Richard Linden <none@none> | 2013-03-06 11:08:49 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-03-06 11:08:49 -0800 |
| commit | 4a5f14afc987b645c68705b0313aebbc3ba1d811 (patch) | |
| tree | be3c96145b3be558b0131978a7c53c3aece15852 /indra/llui/llview.cpp | |
| parent | a6bb68b6e530df91d03abfc062c700ebc4e856aa (diff) | |
| parent | f07b9c2c69f1f6882dcf249aacf33cdfacf878ab (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 47bf410af6..587953477d 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -67,7 +67,7 @@ LLView* LLView::sPreviewClickedElement = NULL; BOOL LLView::sDrawPreviewHighlights = FALSE; S32 LLView::sLastLeftXML = S32_MIN; S32 LLView::sLastBottomXML = S32_MIN; -LLTrace::MemStat LLView::sMemStat("LLView"); +LLTrace::MemStatHandle LLView::sMemStat("LLView"); std::vector<LLViewDrawContext*> LLViewDrawContext::sDrawContextStack; LLView::DrilldownFunc LLView::sDrilldown = |