From 8bb0a6ef737cb40c8f64f37fe64ecc7f6a87ae18 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 9 Oct 2012 18:07:31 -0700
Subject: post merge cleanup

---
 indra/llcommon/lltracerecording.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

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

diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp
index 93d2136e7f..d931c4ed29 100644
--- a/indra/llcommon/lltracerecording.cpp
+++ b/indra/llcommon/lltracerecording.cpp
@@ -46,6 +46,16 @@ Recording::Recording()
 Recording::~Recording()
 {}
 
+void Recording::update()
+{
+	if (isStarted())
+	{
+		LLTrace::get_thread_recorder()->update(this);
+		mElapsedSeconds = 0.0;
+		mSamplingTimer.reset();
+	}
+}
+
 void Recording::handleReset()
 {
 	mRates.write()->reset();
@@ -56,27 +66,17 @@ void Recording::handleReset()
 	mSamplingTimer.reset();
 }
 
-void Recording::update()
-{
-	if (mIsStarted)
-	{
-		LLTrace::get_thread_recorder()->update(this);
-		mElapsedSeconds = 0.0;
-		mSamplingTimer.reset();
-	}
-}
-
 void Recording::handleStart()
 {
-		mSamplingTimer.reset();
-		LLTrace::get_thread_recorder()->activate(this);
+	mSamplingTimer.reset();
+	LLTrace::get_thread_recorder()->activate(this);
 }
 
 void Recording::handleStop()
-	{
-		mElapsedSeconds += mSamplingTimer.getElapsedTimeF64();
-		LLTrace::get_thread_recorder()->deactivate(this);
-	}
+{
+	mElapsedSeconds += mSamplingTimer.getElapsedTimeF64();
+	LLTrace::get_thread_recorder()->deactivate(this);
+}
 
 void Recording::handleSplitTo(Recording& other)
 {
-- 
cgit v1.2.3