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.cpp | |
| parent | 52e8b2a1a279e13a39a95b32a301780998b8d8c4 (diff) | |
| parent | 074c1f1de45f60059c97cf9cfd0bbb9fddbb52c4 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting/
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 6ffd3d8fa4..c6ac7af93c 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -95,7 +95,7 @@ extern LLPipeline gPipeline; U32 LLViewerObjectList::sSimulatorMachineIndex = 1; // Not zero deliberately, to speed up index check. std::map<U64, U32> LLViewerObjectList::sIPAndPortToIndex; std::map<U64, LLUUID> LLViewerObjectList::sIndexAndLocalIDToUUID; -LLTrace::MeasurementStatHandle<> LLViewerObjectList::sCacheHitRate("object_cache_hits"); +LLTrace::SampleStatHandle<> LLViewerObjectList::sCacheHitRate("object_cache_hits"); LLViewerObjectList::LLViewerObjectList() { |