summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-03-22 10:56:19 -0700
committerRichard Linden <none@none>2013-03-22 10:56:19 -0700
commit21b7de56ad6c1efd81ad4406aba1428633b9356e (patch)
treee43549e0684da27f03e6507bc118403e876c2458 /indra/llcommon
parent68f9f656cd22332e46959a90347e38f79c19a66c (diff)
parent041024e8e5d1f27ab77dc4fa2c1e38b8266e7b41 (diff)
Automated merge with bundle:d:\code\viewer-interesting+c:\users\richard\appdata\local\temp\thg.sp0eps\ssh__richard@hg.lindenlab.com_richard_viewer-interesting-metrics_5o81ck.hg
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;