diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 76e45a0bf5..438bc18c20 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -81,10 +81,8 @@
 #include "llinventorybridge.h"
 #include "llinventorydefines.h"
 #include "llinventoryfunctions.h"
-#include "lllogininstance.h" // <FS:AW  opensim destinations and avatar picker>
 #include "llpanellogin.h"
 #include "llpanelblockedlist.h"
-#include "piemenu.h"		// ## Zi: Pie Menu
 #include "llmenuoptionpathfindingrebakenavmesh.h"
 #include "llmoveview.h"
 #include "llparcel.h"
@@ -124,25 +122,22 @@
 #include "llwindow.h"
 #include "llpathfindingmanager.h"
 #include "boost/unordered_map.hpp"
+
+// Firestorm includes
 // [RLVa:KB] - Checked: 2011-05-22 (RLVa-1.3.1a)
 #include "rlvhandler.h"
 #include "rlvlocks.h"
 // [/RLVa:KB]
-//-TT Client LSL Bridge
 #include "fslslbridge.h"
-//-TT
 #include "fscommon.h"
-
-// ## Zi: Texture Refresh
-#include "llavatarpropertiesprocessor.h"
-#include "lltexturecache.h"
-// ## Zi: Texture Refresh
-
-#include "particleeditor.h"
-#include "fscontactsfloater.h"		// <FS:Zi> Display group list in contacts floater
+#include "fscontactsfloater.h"	// <FS:Zi> Display group list in contacts floater
 #include "fswsassetblacklist.h"
-
+#include "llavatarpropertiesprocessor.h"	// ## Zi: Texture Refresh
+#include "lltexturecache.h"	// ## Zi: Texture Refresh
+#include "lllogininstance.h"	// <FS:AW  opensim destinations and avatar picker>
 #include "llvovolume.h"
+#include "particleeditor.h"
+#include "piemenu.h"	// ## Zi: Pie Menu
 
 using namespace LLVOAvatarDefines;
 
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index d8bfd6de37..bc4a3bccae 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -4703,8 +4703,8 @@ U32 LLVOAvatar::renderTransparent(BOOL first_pass)
 		// Can't test for baked hair being defined, since that won't always be the case (not all viewers send baked hair)
 		// TODO: 1.25 will be able to switch this logic back to calling isTextureVisible();
 
-		if ( getImage(TEX_HAIR_BAKED, 0)
-			&& getImage(TEX_HAIR_BAKED, 0)->getID() != IMG_INVISIBLE || LLDrawPoolAlpha::sShowDebugAlpha)
+		if ((getImage(TEX_HAIR_BAKED, 0)
+			&& getImage(TEX_HAIR_BAKED, 0)->getID() != IMG_INVISIBLE) || LLDrawPoolAlpha::sShowDebugAlpha)
 		{
 			num_indices += mMeshLOD[MESH_ID_HAIR]->render(mAdjustedPixelArea, first_pass, mIsDummy);
 			first_pass = FALSE;