diff --git a/indra/llrender/llpostprocess.cpp b/indra/llrender/llpostprocess.cpp
index c0db66a5e..a2add954f 100644
--- a/indra/llrender/llpostprocess.cpp
+++ b/indra/llrender/llpostprocess.cpp
@@ -304,10 +304,6 @@ void LLPostProcess::doEffects(void)
 	/// Copy the screen buffer to the render texture
 	copyFrameBuffer();
 
-	/// Clear the frame buffer.
-	//glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
-	//glClear(GL_COLOR_BUFFER_BIT);
-
 	//Disable depth. Set blendmode to replace.
 	LLGLDepthTest depth(GL_FALSE);
 	LLGLEnable blend(GL_BLEND);
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index a8fd1c352..f81728318 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -945,7 +945,7 @@ void LLAppViewer::initMaxHeapSize()
 	 
     if(fnIsWow64Process && fnIsWow64Process(GetCurrentProcess(), &bWow64Process) && bWow64Process)
 	{
-		max_heap_size_gb = 3.7;
+		max_heap_size_gb = 3.7f;
 	}
 	else if(ERROR_SUCCESS == RegOpenKey(HKEY_LOCAL_MACHINE, TEXT("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management"), &hKey))
 	{
@@ -954,7 +954,7 @@ void LLAppViewer::initMaxHeapSize()
         if(ERROR_SUCCESS == RegQueryValueEx(hKey, TEXT("PhysicalAddressExtension"), NULL, NULL, (LPBYTE)&dwResult, &dwSize))
         {
 			if(dwResult)
-				max_heap_size_gb = 3.7;
+				max_heap_size_gb = 3.7f;
 		}
 		RegCloseKey(hKey);
 	}
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index 388a2cf4a..c83eb9bf4 100644
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -441,7 +441,7 @@ void LLViewerParcelMgr::renderRect(const LLVector3d &west_south_bottom_global,
 {
 	LLGLSUIDefault gls_ui;
 	gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-	LLGLDepthTest gls_depth(GL_TRUE);
+	LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
 
 	LLVector3 west_south_bottom_agent = gAgent.getPosAgentFromGlobal(west_south_bottom_global);
 	F32 west	= west_south_bottom_agent.mV[VX];
@@ -698,7 +698,7 @@ void LLViewerParcelMgr::renderHighlightSegments(const U8* segments, LLViewerRegi
 
 	LLGLSUIDefault gls_ui;
 	gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-	LLGLDepthTest gls_depth(GL_TRUE);
+	LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
 
 	gGL.color4f(1.f, 1.f, 0.f, 0.2f);
 
@@ -977,7 +977,7 @@ void LLViewerObjectList::renderObjectBeacons()
 
 	{
 		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-		LLGLDepthTest gls_depth(GL_TRUE);
+		LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
 		
 		S32 last_line_width = -1;
 		// gGL.begin(LLRender::LINES); // Always happens in (line_width != last_line_width)
diff --git a/indra/newview/llviewerparceloverlay.cpp b/indra/newview/llviewerparceloverlay.cpp
index ab1307935..1c2db126f 100644
--- a/indra/newview/llviewerparceloverlay.cpp
+++ b/indra/newview/llviewerparceloverlay.cpp
@@ -872,7 +872,7 @@ S32 LLViewerParcelOverlay::renderPropertyLines	()
 
 	LLGLSUIDefault gls_ui; // called from pipeline
 	gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-	LLGLDepthTest mDepthTest(GL_TRUE);
+	LLGLDepthTest mDepthTest(GL_TRUE, GL_FALSE);
 
 	// Find camera height off the ground (not from zero)
 	F32 ground_height_at_camera = land.resolveHeightGlobal( gAgentCamera.getCameraPositionGlobal() );
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 015b4f84f..71d345192 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -3263,7 +3263,7 @@ void render_hud_elements()
 {
 	LLFastTimer t(LLFastTimer::FTM_RENDER_UI);
 	gPipeline.disableLights();		
-	
+
 	LLGLDisable fog(GL_FOG);
 	LLGLSUIDefault gls_ui;
 
@@ -3280,22 +3280,25 @@ void render_hud_elements()
 	}
 	LLGLDepthTest depth(GL_TRUE, GL_FALSE);
 
-	if (!LLPipeline::sReflectionRender && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
+	if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
 	{
-		static const LLCachedControl<U32> RenderFSAASamples("RenderFSAASamples",0);
-		LLGLEnable multisample(RenderFSAASamples > 0 ? GL_MULTISAMPLE_ARB : 0);
-		gViewerWindow->renderSelections(FALSE, FALSE, FALSE); // For HUD version in render_ui_3d()
+		if(!LLPipeline::sReflectionRender)
+		{
+			static const LLCachedControl<U32> RenderFSAASamples("RenderFSAASamples",0);
+			LLGLEnable multisample(RenderFSAASamples > 0 ? GL_MULTISAMPLE_ARB : 0);
+			gViewerWindow->renderSelections(FALSE, FALSE, FALSE); // For HUD version in render_ui_3d()
 	
-		// Draw the tracking overlays
-		LLTracker::render3D();
+			// Draw the tracking overlays
+			LLTracker::render3D();
 		
-		// Show the property lines
-		LLWorld::getInstance()->renderPropertyLines();
-		LLViewerParcelMgr::getInstance()->render();
-		LLViewerParcelMgr::getInstance()->renderParcelCollision();
+			// Show the property lines
+			LLWorld::getInstance()->renderPropertyLines();
+			LLViewerParcelMgr::getInstance()->render();
+			LLViewerParcelMgr::getInstance()->renderParcelCollision();
 	
-		// Render name tags.
-		LLHUDObject::renderAll();
+			// Render name tags.
+			LLHUDObject::renderAll();
+		}
 	}
 	else if (gForceRenderLandFence)
 	{