diff options
| author | Richard Linden <none@none> | 2013-01-17 23:30:50 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-17 23:30:50 -0800 |
| commit | 033e96259912b1bfaa96529386bf255fab24c17f (patch) | |
| tree | 427d207ce41924740c5815871330df7c925cec2d /indra/llcommon | |
| parent | d290112d6f531bfe72700e85ddf48854cf1ab8d7 (diff) | |
| parent | f740faf760cedec5b72928224b386c0dc8a3dd6e (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; |