diff options
| author | Richard Linden <none@none> | 2013-01-18 16:02:03 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-18 16:02:03 -0800 |
| commit | a4d01f05e054eb0f7cbe2621548429cea70ffe26 (patch) | |
| tree | ccf47ea062bb77c2166e826d85c104bc3a17e798 /indra/llcommon | |
| parent | e975ae35ab57f56adfaed64bc108240a5013f040 (diff) | |
| parent | 033e96259912b1bfaa96529386bf255fab24c17f (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/lltracerecording.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h index e6b5e85f90..a773c9ad91 100644 --- a/indra/llcommon/lltracerecording.h +++ b/indra/llcommon/lltracerecording.h @@ -389,6 +389,7 @@ namespace LLTrace class ExtendableRecording : public LLStopWatchControlsMixin<ExtendableRecording> { + public: void extend(); // implementation for LLStopWatchControlsMixin @@ -400,6 +401,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; |