From d89d9cd10ff1fbe6f1f86f0b282075e775ed1b51 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@lindenlab.com>
Date: Fri, 11 Jan 2013 01:52:09 +0000
Subject: gcc fixes

---
 indra/newview/llfasttimerview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp
index 32ed662548..ba298ed819 100644
--- a/indra/newview/llfasttimerview.cpp
+++ b/indra/newview/llfasttimerview.cpp
@@ -514,7 +514,7 @@ void LLFastTimerView::draw()
 			else
 			{
 				ms = LLUnit<LLUnits::Seconds, F64>(frame_recording.getPeriodMean(*idp));
-				calls = (S32)frame_recording.getPeriodMean((F32)idp->callCount());
+				calls = (S32)frame_recording.getPeriodMean(idp->callCount());
 			}
 
 			if (mDisplayCalls)
-- 
cgit v1.2.3


From d81388f65b0fec29bd83cfee84e0291f1db15bf6 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 10 Jan 2013 19:24:47 -0800
Subject: SH-3406 WIP convert fast timers to lltrace system fix for gcc build
 error

---
 indra/newview/lltexturefetch.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 9f1c7855be..d62101d159 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -3742,11 +3742,12 @@ TFReqSendMetrics::doWork(LLTextureFetch * fetcher)
 	main_stats.getStats(stats, true);
 	//LLSD merged_llsd = main_stats.asLLSD();
 
+	bool initial_report = !reporting_started;
 	stats.session_id = mSessionID;
 	stats.agent_id = mAgentID;
 	stats.message = "ViewerAssetMetrics";
 	stats.sequence = static_cast<bool>(report_sequence);
-	stats.initial = static_cast<bool>(!reporting_started);
+	stats.initial = initial_report;
 	stats.break_ = static_cast<bool>(LLTextureFetch::svMetricsDataBreak);
 
 	LLSD sd;
-- 
cgit v1.2.3