diff options
| author | Richard Linden <none@none> | 2013-04-08 13:59:19 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-04-08 13:59:19 -0700 |
| commit | 288b43facb89184cc8fced7e7542baa2c8549831 (patch) | |
| tree | 4cc9a03bc065810bbc39c6eda86852a6b3d6b53f /indra/llcommon | |
| parent | 164273afbb8131c5961266b7cb2c1e1d7973ea0b (diff) | |
| parent | b4967dfa4f3817c890644cb9a545264b65fd747a (diff) | |
Automated merge with bundle:c:\code\viewer-interesting+c:\users\richard\appdata\local\temp\thg.63pnn4\ssh__hg.lindenlab.com_richard_viewer-interesting-metrics_efdmpj.hg
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 fbffe133f1..b40aec4886 100644 --- a/indra/llcommon/llfasttimer.cpp +++ b/indra/llcommon/llfasttimer.cpp @@ -185,7 +185,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 b96d0666e5..68f437a231 100644 --- a/indra/llcommon/lltracerecording.h +++ b/indra/llcommon/lltracerecording.h @@ -415,6 +415,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; |