Automated merge with bundle:c:\code\viewer-interesting+c:\users\richard\appdata\local\temp\thg.hcdaac\ssh__hg.lindenlab.com_richard_viewer-interesting-metrics_sa6ddo.hg

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;