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/lltracerecording.h b/indra/llcommon/lltracerecording.h
index 092dc7ff2c..4399a65cfb 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;