From 67091be7a4414687186553282faa5ebabf41fc72 Mon Sep 17 00:00:00 2001
From: Nicky <sl.nicky.ml@googlemail.com>
Date: Sat, 25 Jun 2016 20:18:16 +0200
Subject: [PATCH] Linux; Make sure GCC is still happy after latest updates.

---
 indra/newview/lldrawpooltree.cpp | 5 ++++-
 indra/newview/rlvactions.cpp     | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/indra/newview/lldrawpooltree.cpp b/indra/newview/lldrawpooltree.cpp
index 98df6f1c28..06d8547f12 100644
--- a/indra/newview/lldrawpooltree.cpp
+++ b/indra/newview/lldrawpooltree.cpp
@@ -99,7 +99,10 @@ void LLDrawPoolTree::render(S32 pass)
 	LLOverrideFaceColor color(this, 1.f, 1.f, 1.f, 1.f);
 
 // [SL:KB] - Patch: Render-TextureToggle (Catznip-4.0)
-	gGL.getTexUnit(sDiffTex)->bind( (LLPipeline::sRenderTextures) ? mTexturep : LLViewerFetchedTexture::sDefaultDiffuseImagep );
+	if( (LLPipeline::sRenderTextures) )
+		gGL.getTexUnit(sDiffTex)->bind( mTexturep );
+	else
+		gGL.getTexUnit(sDiffTex)->bind( LLViewerFetchedTexture::sDefaultDiffuseImagep );
 // [/SL:KB]
 //	gGL.getTexUnit(sDiffTex)->bind(mTexturep);
 				
diff --git a/indra/newview/rlvactions.cpp b/indra/newview/rlvactions.cpp
index 1def8205fb..d58781cdb9 100644
--- a/indra/newview/rlvactions.cpp
+++ b/indra/newview/rlvactions.cpp
@@ -199,6 +199,8 @@ bool RlvActions::canShowName(EShowNamesContext eContext, const LLUUID& idAgent)
 			case SNC_TELEPORTOFFER:
 			case SNC_TELEPORTREQUEST:
 				return gRlvHandler.isException(RLV_BHVR_SHOWNAMES, idAgent);
+			default:
+				return false;
 		}
 	}
 	return false;