diff options
author | Richard Linden <none@none> | 2012-11-01 17:52:11 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2012-11-01 17:52:11 -0700 |
commit | 74fe126590fba03752d1d8d88dd3bb59c6900026 (patch) | |
tree | 8ce225ede4db348ce7ae1a576da4ed98da54a40a /indra/llcommon/lltracerecording.h | |
parent | 3ccbce90e37b92d5b32a2507804adc91bc58065d (diff) |
SH-3405 FIX convert existing stats to lltrace system
output of floater_stats is now identical to pre-lltrace system (with some tweaks)
Diffstat (limited to 'indra/llcommon/lltracerecording.h')
-rw-r--r-- | indra/llcommon/lltracerecording.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h index 4af973515d..a11f04b14b 100644 --- a/indra/llcommon/lltracerecording.h +++ b/indra/llcommon/lltracerecording.h @@ -81,12 +81,12 @@ class LLVCRControlsMixin public: void splitTo(DERIVED& other) { - onSplitTo(other); + handleSplitTo(other); } void splitFrom(DERIVED& other) { - other.onSplitTo(*this); + other.handleSplitTo(*this); } private: // atomically stop this object while starting the other @@ -107,7 +107,7 @@ namespace LLTrace void makePrimary(); bool isPrimary() const; - void mergeRecording(const Recording& other); + void appendRecording(const Recording& other); void update(); |