diff options
| author | Richard Linden <none@none> | 2012-10-09 22:18:07 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-10-09 22:18:07 -0700 |
| commit | 05510799e5a69eafcc919e72d25cf5b89c9274cf (patch) | |
| tree | b019cdf1650c9a886134fb685cd7fee32d6a5caa /indra/llcommon/lltracerecording.cpp | |
| parent | 8bb0a6ef737cb40c8f64f37fe64ecc7f6a87ae18 (diff) | |
SH-3275 WIP Update viewer metrics system to be more flexible
renamed mergeSamples to mergeRecording
Diffstat (limited to 'indra/llcommon/lltracerecording.cpp')
| -rw-r--r-- | indra/llcommon/lltracerecording.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |