diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-01-16 10:39:23 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-01-16 10:39:23 -0700 |
| commit | f740faf760cedec5b72928224b386c0dc8a3dd6e (patch) | |
| tree | a4f7d17f88306af89badea6b03e417ef12587b23 /indra/llcommon/lltracerecording.h | |
| parent | 670d03ceb83b92c9bb98d10bb37fba6f75971a2f (diff) | |
| parent | 45a7fe901aa4cd7af14fa1cb894da46a988e3aa2 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/llcommon/lltracerecording.h')
| -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; |