1 files changed, 16 insertions, 6 deletions
diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp
index 7cd6280f03..93d2136e7f 100644
--- a/indra/llcommon/lltracerecording.cpp
+++ b/indra/llcommon/lltracerecording.cpp
@@ -56,18 +56,28 @@ void Recording::handleReset()
 	mSamplingTimer.reset();
 }
 
-void Recording::handleStart()
+void Recording::update()
 {
-	mSamplingTimer.reset();
-	LLTrace::get_thread_recorder()->activate(this);
+	if (mIsStarted)
+	{
+		LLTrace::get_thread_recorder()->update(this);
+		mElapsedSeconds = 0.0;
+		mSamplingTimer.reset();
+	}
 }
 
-void Recording::handleStop()
+void Recording::handleStart()
 {
-	mElapsedSeconds += mSamplingTimer.getElapsedTimeF64();
-	LLTrace::get_thread_recorder()->deactivate(this);
+		mSamplingTimer.reset();
+		LLTrace::get_thread_recorder()->activate(this);
 }
 
+void Recording::handleStop()
+	{
+		mElapsedSeconds += mSamplingTimer.getElapsedTimeF64();
+		LLTrace::get_thread_recorder()->deactivate(this);
+	}
+
 void Recording::handleSplitTo(Recording& other)
 {
 	stop();