summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-03-18 23:39:44 -0700
committerRichard Linden <none@none>2013-03-18 23:39:44 -0700
commitc01c798e73ab7dd05db4ed0fa831b44928945996 (patch)
tree5645bc381bcec8ef259a644da327be89baea25b0 /indra/llcommon
parent452d3350a241695d962dc58403ce4e35541b6353 (diff)
parentf59bd5f89ffd2dadbd3d7514cfa8e8cc97172201 (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;