diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp index f45226eb9a76cc0cb3e6f92afaa2cb157647365f..913c4cbdad12a9fdb45d73dda035b9d210ad2660 100644 --- a/indra/llcommon/lltracerecording.cpp +++ b/indra/llcommon/lltracerecording.cpp @@ -470,43 +470,51 @@ void ExtendableRecording::extend() void ExtendableRecording::start() { + LLStopWatchControlsMixin<ExtendableRecording>::start(); mPotentialRecording.start(); } void ExtendableRecording::stop() { + LLStopWatchControlsMixin<ExtendableRecording>::stop(); mPotentialRecording.stop(); } void ExtendableRecording::pause() { + LLStopWatchControlsMixin<ExtendableRecording>::pause(); mPotentialRecording.pause(); } void ExtendableRecording::resume() { + LLStopWatchControlsMixin<ExtendableRecording>::resume(); mPotentialRecording.resume(); } void ExtendableRecording::restart() { + LLStopWatchControlsMixin<ExtendableRecording>::restart(); mAcceptedRecording.reset(); mPotentialRecording.restart(); } void ExtendableRecording::reset() { + LLStopWatchControlsMixin<ExtendableRecording>::reset(); mAcceptedRecording.reset(); mPotentialRecording.reset(); } void ExtendableRecording::splitTo(ExtendableRecording& other) { + LLStopWatchControlsMixin<ExtendableRecording>::splitTo(other); mPotentialRecording.splitTo(other.mPotentialRecording); } void ExtendableRecording::splitFrom(ExtendableRecording& other) { + LLStopWatchControlsMixin<ExtendableRecording>::splitFrom(other); mPotentialRecording.splitFrom(other.mPotentialRecording); } diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h index e6b5e85f90d10e85d7e32dcf70a6b8787c280189..f575fbd8b23c33da70f0e923b5cf4b135fcb1ac6 100644 --- a/indra/llcommon/lltracerecording.h +++ b/indra/llcommon/lltracerecording.h @@ -389,7 +389,9 @@ namespace LLTrace class ExtendableRecording : public LLStopWatchControlsMixin<ExtendableRecording> { + public: void extend(); + Recording& getAcceptedRecording() { return mAcceptedRecording; } // implementation for LLStopWatchControlsMixin /*virtual*/ void start();