From 05510799e5a69eafcc919e72d25cf5b89c9274cf Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 9 Oct 2012 22:18:07 -0700
Subject: SH-3275 WIP Update viewer metrics system to be more flexible renamed
 mergeSamples to mergeRecording

---
 indra/llcommon/lltracerecording.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon/lltracerecording.cpp')

diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp
index d931c4ed29..9a08770bd7 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);
-- 
cgit v1.3