diff options
author | Richard Linden <none@none> | 2013-03-06 11:27:12 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-03-06 11:27:12 -0800 |
commit | 9a81945eac31f41848cd48a5ba18dee4949f2d03 (patch) | |
tree | 2a0a6644adfa609651ce9c42a808ce67bef9d0b3 /indra/llui/llview.cpp | |
parent | dcf4e489213d6e954a34fbb3c5c96e94645b868b (diff) | |
parent | e52e5fe5be0d2f4e0e8ded445bd18c0985ef968a (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
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 = |