diff options
| author | Richard Linden <none@none> | 2013-05-29 17:03:45 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-05-29 17:03:45 -0700 |
| commit | 174cfa0a7a49110dc2ff13850aa5ff48916711dc (patch) | |
| tree | f37413130f8c2628e5c0652458fc4fa4e0a653ba /indra/newview/llviewerobjectlist.h | |
| parent | 52e8b2a1a279e13a39a95b32a301780998b8d8c4 (diff) | |
| parent | 074c1f1de45f60059c97cf9cfd0bbb9fddbb52c4 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting/
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
| -rw-r--r-- | indra/newview/llviewerobjectlist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h index 65447156e7..464554245e 100644 --- a/indra/newview/llviewerobjectlist.h +++ b/indra/newview/llviewerobjectlist.h @@ -198,7 +198,7 @@ protected: std::vector<OrphanInfo> mOrphanChildren; // UUID's of orphaned objects S32 mNumOrphans; - static LLTrace::MeasurementStatHandle<> sCacheHitRate; + static LLTrace::SampleStatHandle<> sCacheHitRate; typedef std::vector<LLPointer<LLViewerObject> > vobj_list_t; |