diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp
index d931c4ed29c404cf2d17c0236f04e445a3948c43..9a08770bd7668916a1e5686a9c2e7b5379fd0e40 100644
--- a/indra/llcommon/lltracerecording.cpp
+++ b/indra/llcommon/lltracerecording.cpp
@@ -97,7 +97,7 @@ bool Recording::isPrimary()
 	return mRates->isPrimary();
 }
 
-void Recording::mergeSamples( const Recording& other )
+void Recording::mergeRecording( const Recording& other )
 {
 	mRates.write()->mergeSamples(*other.mRates);
 	mMeasurements.write()->mergeSamples(*other.mMeasurements);
diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h
index 092dc7ff2cf68b826e3285edbb29ed87a567a4f3..4399a65cfb2d7fe8f73d9746030ab373625d4d80 100644
--- a/indra/llcommon/lltracerecording.h
+++ b/indra/llcommon/lltracerecording.h
@@ -194,7 +194,7 @@ namespace LLTrace
 		void makePrimary();
 		bool isPrimary();
 
-		void mergeSamples(const Recording& other);
+		void mergeRecording(const Recording& other);
 		void mergeDeltas(const Recording& baseline, const Recording& target);
 
 		void reset();
@@ -300,7 +300,7 @@ namespace LLTrace
 				mTotalRecording.reset();
 				for (S32 i = (mCurPeriod + 1) % mNumPeriods; i < mCurPeriod; i++)
 				{
-					mTotalRecording.mergeSamples(mRecordingPeriods[i]);
+					mTotalRecording.mergeRecording(mRecordingPeriods[i]);
 				}
 			}
 			mTotalValid = true;
diff --git a/indra/llcommon/lltracethreadrecorder.cpp b/indra/llcommon/lltracethreadrecorder.cpp
index b2c6fe3b80d6b26a099bf86fbcf8b929ddc5ec62..4d020f5650d47ffa9ac22334ccb16b539fcce4e4 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);
 }
 
 ///////////////////////////////////////////////////////////////////////