diff options
| author | Richard Linden <none@none> | 2013-04-12 11:53:54 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-04-12 11:53:54 -0700 |
| commit | 8db22a591645a3a7c3308827ca819bc2415692d8 (patch) | |
| tree | 72a48ab9da03f06c1725318c6a46986cd52d0ad5 /indra/llcommon | |
| parent | f964c8faa84cfa95bbf73552e99a2d0b80f7bee2 (diff) | |
| parent | 493b84f2fc34ab1bb798b20c022be6edf036b3d7 (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 1412d78a56..a7e1606a5a 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; |