diff options
| author | Richard Linden <none@none> | 2013-04-12 15:56:49 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-04-12 15:56:49 -0700 |
| commit | 06a953f7fece6e7c5cb8f9facd246580767f8591 (patch) | |
| tree | 18e0db8a706d6451ebad1ab640871a3ca0f52d1c /indra/llcommon | |
| parent | 39d8ea6327ad96b4977dfec991a20d66e2442b50 (diff) | |
| parent | dea70426a5c96957dd73b7a50c7fdedf77a3bdfb (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llfasttimer.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/lltracerecording.h | 2 |
2 files changed, 3 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) { diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h index 511db0e115..afbaaa0108 100644 --- a/indra/llcommon/lltracerecording.h +++ b/indra/llcommon/lltracerecording.h @@ -434,6 +434,8 @@ namespace LLTrace /*virtual*/ void reset(); /*virtual*/ void splitTo(ExtendableRecording& other); /*virtual*/ void splitFrom(ExtendableRecording& other); + + const Recording& getAcceptedRecording() const {return mAcceptedRecording;} private: Recording mAcceptedRecording; Recording mPotentialRecording; |