summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-02-09 00:54:46 -0800
committerRichard Linden <none@none>2013-02-09 00:54:46 -0800
commit50d35d00cb68f0c9119b562f85ccefa4d279f0f9 (patch)
tree23dd1fef3401a31216e0ee4563c9461f53c13e91 /indra/llcommon
parent2e15e8fd4ba62204c76f6e2a91d3e50f62e6c1fc (diff)
parent8144fa95701122f24c36b8ae2a51a5ce720614a6 (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 af9ba02b29..16fee04979 100644
--- a/indra/llcommon/lltracerecording.h
+++ b/indra/llcommon/lltracerecording.h
@@ -405,6 +405,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;