summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-03-21 19:08:15 -0700
committerRichard Linden <none@none>2013-03-21 19:08:15 -0700
commit5525257b8580df3dbc9860370564e19c9d6cbbaa (patch)
tree5399513cec95ec11b1d607118c5096449a8ce8c1 /indra/llcommon
parent368dd542bec7c31e14673b83d3342c35717d2920 (diff)
parent8d8a2d5681f2b18150e05d8f9f7d84ce233c9e26 (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 3e7ed2b592..a6fb07ac15 100644
--- a/indra/llcommon/lltracerecording.h
+++ b/indra/llcommon/lltracerecording.h
@@ -415,6 +415,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;