merge

1 files changed, 6 insertions, 6 deletions

diff --git a/indra/llcommon/lltraceaccumulators.cpp b/indra/llcommon/lltraceaccumulators.cpp
index b234f43337..58d0b5b227 100644
--- a/indra/llcommon/lltraceaccumulators.cpp
+++ b/indra/llcommon/lltraceaccumulators.cpp
@@ -70,13 +70,13 @@ void AccumulatorBufferGroup::makeCurrent()
 }
 
 //static
-void AccumulatorBufferGroup::resetCurrent()
+void AccumulatorBufferGroup::clearCurrent()
 {
-	AccumulatorBuffer<CountAccumulator>::resetCurrent();	
-	AccumulatorBuffer<SampleAccumulator>::resetCurrent();
-	AccumulatorBuffer<EventAccumulator>::resetCurrent();
-	AccumulatorBuffer<TimeBlockAccumulator>::resetCurrent();
-	AccumulatorBuffer<MemStatAccumulator>::resetCurrent();
+	AccumulatorBuffer<CountAccumulator>::clearCurrent();	
+	AccumulatorBuffer<SampleAccumulator>::clearCurrent();
+	AccumulatorBuffer<EventAccumulator>::clearCurrent();
+	AccumulatorBuffer<TimeBlockAccumulator>::clearCurrent();
+	AccumulatorBuffer<MemStatAccumulator>::clearCurrent();
 }
 
 bool AccumulatorBufferGroup::isCurrent() const