SH-3275 WIP Update viewer metrics system to be more flexible

renamed mergeSamples to mergeRecording

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/llcommon/lltracethreadrecorder.cpp b/indra/llcommon/lltracethreadrecorder.cpp
index b2c6fe3b80..4d020f5650 100644
--- a/indra/llcommon/lltracethreadrecorder.cpp
+++ b/indra/llcommon/lltracethreadrecorder.cpp
@@ -161,13 +161,13 @@ void SlaveThreadRecorder::pushToMaster()
 void SlaveThreadRecorder::SharedData::copyFrom( const Recording& source )
 {
 	LLMutexLock lock(&mRecorderMutex);
-	mRecorder.mergeSamples(source);
+	mRecorder.mergeRecording(source);
 }
 
 void SlaveThreadRecorder::SharedData::copyTo( Recording& sink )
 {
 	LLMutexLock lock(&mRecorderMutex);
-	sink.mergeSamples(mRecorder);
+	sink.mergeRecording(mRecorder);
 }
 
 ///////////////////////////////////////////////////////////////////////