diff options
author | Richard Linden <none@none> | 2013-04-12 15:26:37 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-04-12 15:26:37 -0700 |
commit | dea70426a5c96957dd73b7a50c7fdedf77a3bdfb (patch) | |
tree | c493f5e7f2a4717e053e84a6cba3414d7bdd73bb /indra/llcommon/llfasttimer.cpp | |
parent | a904e7b21b64a87073a446445de46318832d1eb1 (diff) | |
parent | 1ddad3737977b9e750c4d1815ea99b51e75f18aa (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/llcommon/llfasttimer.cpp')
-rw-r--r-- | indra/llcommon/llfasttimer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp index a7adcc6729..5dc5fdd5be 100644 --- a/indra/llcommon/llfasttimer.cpp +++ b/indra/llcommon/llfasttimer.cpp @@ -188,7 +188,7 @@ void TimeBlock::processTimes() U64 cur_time = getCPUClockCount64(); // set up initial tree - for (LLInstanceTracker<TimeBlock>::instance_iter it = LLInstanceTracker<TimeBlock>::beginInstances(), end_it = LLInstanceTracker<TimeBlock>::endInstances(); + for (LLInstanceTracker<TimeBlock>::instance_iter begin_it = LLInstanceTracker<TimeBlock>::beginInstances(), end_it = LLInstanceTracker<TimeBlock>::endInstances(), it = begin_it; it != end_it; ++it) { |