summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-03-18 20:23:23 -0700
committerRichard Linden <none@none>2013-03-18 20:23:23 -0700
commit059d1a75b2d26752e7753346dc0b8cc521453783 (patch)
treeac640b7a133e2ca419897a9021106b21db004936 /indra/llcommon
parentdf6dfc4d1d3f9efc0035b3596dfbd9ea251328b6 (diff)
parent47c608becb629e368a1b227ab30299df7155effd (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/lltracerecording.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h
index 751ff298ce..01cc835d58 100644
--- a/indra/llcommon/lltracerecording.h
+++ b/indra/llcommon/lltracerecording.h
@@ -408,6 +408,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;