summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawable.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/newview/lldrawable.cpp
parenta6bb68b6e530df91d03abfc062c700ebc4e856aa (diff)
parentf07b9c2c69f1f6882dcf249aacf33cdfacf878ab (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/newview/lldrawable.cpp')
-rw-r--r--indra/newview/lldrawable.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index ba970671af..9c3d9f4d34 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -59,7 +59,7 @@ const F32 MIN_SHADOW_CASTER_RADIUS = 2.0f;
static LLFastTimer::DeclareTimer FTM_CULL_REBOUND("Cull Rebound");
extern bool gShiftFrame;
-LLTrace::MemStat LLDrawable::sMemStat("LLDrawable");
+LLTrace::MemStatHandle LLDrawable::sMemStat("LLDrawable");
////////////////////////