From 3040b429a3b136b87ddb0ae88ccfa3a7aa71e232 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 6 Feb 2014 11:27:16 -0800
Subject: added LL_TRACE_ENABLED to allow disabling of lltrace

---
 indra/llcommon/llfasttimer.cpp | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp
index 9b093e8936..d46e257af7 100755
--- a/indra/llcommon/llfasttimer.cpp
+++ b/indra/llcommon/llfasttimer.cpp
@@ -294,6 +294,7 @@ static LLTrace::BlockTimerStatHandle FTM_PROCESS_TIMES("Process FastTimer Times"
 //static
 void BlockTimer::processTimes()
 {
+#if LL_TRACE_ENABLED
 	LL_RECORD_BLOCK_TIME(FTM_PROCESS_TIMES);
 	get_clock_count(); // good place to calculate clock frequency
 
@@ -316,6 +317,7 @@ void BlockTimer::processTimes()
 		accumulator.mLastCaller = NULL;
 		accumulator.mMoveUpTree = false;
 	}
+#endif
 }
 
 std::vector<BlockTimerStatHandle*>::iterator BlockTimerStatHandle::beginChildren()
@@ -449,6 +451,7 @@ TimeBlockAccumulator::TimeBlockAccumulator()
 
 void TimeBlockAccumulator::addSamples( const TimeBlockAccumulator& other, EBufferAppendType append_type )
 {
+#if LL_TRACE_ENABLED
 	// we can't merge two unrelated time block samples, as that will screw with the nested timings
 	// due to the call hierarchy of each thread
 	llassert(append_type == SEQUENTIAL);
@@ -459,6 +462,7 @@ void TimeBlockAccumulator::addSamples( const TimeBlockAccumulator& other, EBuffe
 	mActiveCount = other.mActiveCount;
 	mMoveUpTree = other.mMoveUpTree;
 	mParent = other.mParent;
+#endif
 }
 
 void TimeBlockAccumulator::reset( const TimeBlockAccumulator* other )
-- 
cgit v1.2.3