summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-11-16 23:02:53 -0800
committerRichard Linden <none@none>2012-11-16 23:02:53 -0800
commit6db6cb39f41e921e75970d1570a74cf35d353a35 (patch)
tree141e276bfb93ba8b3b7f3ff12d730f3f3cbf5f22 /indra/newview/llviewerobjectlist.cpp
parentc136b432140f892a56d4996d5ed77e903ff0b32d (diff)
SH-3406 WIP convert fast timers to lltrace system
got new fast timer code to compile and run
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
-rw-r--r--indra/newview/llviewerobjectlist.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 9c6045943f..1bd028688a 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -850,6 +850,8 @@ private:
LLSD mObjectIDs;
};
+static LLFastTimer::DeclareTimer FTM_IDLE_COPY("Idle Copy");
+
void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
{
// Update globals
@@ -900,10 +902,8 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
U32 idle_count = 0;
- static LLFastTimer::DeclareTimer idle_copy("Idle Copy");
-
{
- LLFastTimer t(idle_copy);
+ LLFastTimer t(FTM_IDLE_COPY);
for (std::vector<LLPointer<LLViewerObject> >::iterator active_iter = mActiveObjects.begin();
active_iter != mActiveObjects.end(); active_iter++)