SH-3275 WIP interesting Update viewer metrics system to be more flexible

fix for extendablerecording not having right state

2 files changed, 10 insertions, 0 deletions

diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp
index f45226eb9a..913c4cbdad 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 e6b5e85f90..f575fbd8b2 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();