diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp
index 2bfbe0e1c41a98546b62a47a46e61fb0c63a59b3..36aee733fd2f6b24ca6e0345c3e13e60cfac218f 100644
--- a/indra/newview/llfasttimerview.cpp
+++ b/indra/newview/llfasttimerview.cpp
@@ -1126,9 +1126,6 @@ void LLFastTimerView::exportCharts(const std::string& base, const std::string& t
 		base_total_time += base_data[i]["Total"]["Time"].asReal();
 	}
 
-	LLSD::Real total_time = llmax(base_total_time, cur_total_time);
-
-
 	//allocate raw scratch space
 	LLPointer<LLImageRaw> scratch = new LLImageRaw(1024, 512, 3);
 
@@ -1147,11 +1144,8 @@ void LLFastTimerView::exportCharts(const std::string& base, const std::string& t
 	{
 		std::string label = *iter;
 	
-		LLSD::Real cur_start_time = -1.0;
-		LLSD::Real cur_end_time = 0.0;
-
 		LLSD::Real max_time = 0.0;
-		LLSD::Integer max_calls = 0.0;
+		LLSD::Integer max_calls = 0;
 		LLSD::Real max_execution = 0.0;
 
 		std::vector<LLSD::Real> cur_execution;
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index ebb5c1ce488c0c791e495282aacf4cde3e954baf..ec88813b5b44a1331026769eacbaa9cc8d1845c8 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -132,8 +132,7 @@ static bool handleRenderPerfTestChanged(const LLSD& newvalue)
 	bool status = !newvalue.asBoolean();
 	if (!status)
 	{
-		gPipeline.clearRenderTypeMask(LLPipeline::RENDER_TYPE_SKY,
-									  LLPipeline::RENDER_TYPE_WL_SKY,
+		gPipeline.clearRenderTypeMask(LLPipeline::RENDER_TYPE_WL_SKY,
 									  LLPipeline::RENDER_TYPE_GROUND,
 									  LLPipeline::RENDER_TYPE_TERRAIN,
 									  LLPipeline::RENDER_TYPE_GRASS,
@@ -144,13 +143,12 @@ static bool handleRenderPerfTestChanged(const LLSD& newvalue)
 									  LLPipeline::RENDER_TYPE_PARTICLES,
 									  LLPipeline::RENDER_TYPE_CLOUDS,
 									  LLPipeline::RENDER_TYPE_HUD_PARTICLES,
-									  LLPipeline::END_RENDER_TYPES);
+									  LLPipeline::END_RENDER_TYPES); 
 		gPipeline.setRenderDebugFeatureControl(LLPipeline::RENDER_DEBUG_FEATURE_UI, false);
 	}
 	else 
 	{
-		gPipeline.andRenderTypeMask(LLPipeline::RENDER_TYPE_SKY,
-									  LLPipeline::RENDER_TYPE_WL_SKY,
+	gPipeline.andRenderTypeMask(LLPipeline::RENDER_TYPE_WL_SKY,
 									  LLPipeline::RENDER_TYPE_GROUND,
 									  LLPipeline::RENDER_TYPE_TERRAIN,
 									  LLPipeline::RENDER_TYPE_GRASS,