summaryrefslogtreecommitdiff
path: root/indra/llui/llviewmodel.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-03-06 11:08:49 -0800
committerRichard Linden <none@none>2013-03-06 11:08:49 -0800
commit4a5f14afc987b645c68705b0313aebbc3ba1d811 (patch)
treebe3c96145b3be558b0131978a7c53c3aece15852 /indra/llui/llviewmodel.cpp
parenta6bb68b6e530df91d03abfc062c700ebc4e856aa (diff)
parentf07b9c2c69f1f6882dcf249aacf33cdfacf878ab (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/llui/llviewmodel.cpp')
-rw-r--r--indra/llui/llviewmodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llviewmodel.cpp b/indra/llui/llviewmodel.cpp
index 1bd09e8086..901260bec8 100644
--- a/indra/llui/llviewmodel.cpp
+++ b/indra/llui/llviewmodel.cpp
@@ -35,7 +35,7 @@
// external library headers
// other Linden headers
-LLTrace::MemStat LLViewModel::sMemStat("LLViewModel");
+LLTrace::MemStatHandle LLViewModel::sMemStat("LLViewModel");
///
LLViewModel::LLViewModel()