summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawable.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-03-06 11:27:12 -0800
committerRichard Linden <none@none>2013-03-06 11:27:12 -0800
commit9a81945eac31f41848cd48a5ba18dee4949f2d03 (patch)
tree2a0a6644adfa609651ce9c42a808ce67bef9d0b3 /indra/newview/lldrawable.h
parentdcf4e489213d6e954a34fbb3c5c96e94645b868b (diff)
parente52e5fe5be0d2f4e0e8ded445bd18c0985ef968a (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/lldrawable.h')
-rw-r--r--indra/newview/lldrawable.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h
index 161f550bb6..3691bbf71b 100644
--- a/indra/newview/lldrawable.h
+++ b/indra/newview/lldrawable.h
@@ -292,7 +292,7 @@ public:
F32 mDistanceWRTCamera;
static F32 sCurPixelAngle; //current pixels per radian
- static LLTrace::MemStat sMemStat;
+ static LLTrace::MemStatHandle sMemStat;
private:
typedef std::vector<LLFace*> face_list_t;