summaryrefslogtreecommitdiff
path: root/indra/llui/llview.h
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/llview.h
parenta6bb68b6e530df91d03abfc062c700ebc4e856aa (diff)
parentf07b9c2c69f1f6882dcf249aacf33cdfacf878ab (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/llui/llview.h')
-rw-r--r--indra/llui/llview.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 256f86c00d..e18cfff8e5 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -673,7 +673,7 @@ public:
static S32 sLastLeftXML;
static S32 sLastBottomXML;
static BOOL sForceReshape;
- static LLTrace::MemStat sMemStat;
+ static LLTrace::MemStatHandle sMemStat;
};
class LLCompareByTabOrder