changes to fix compiler warnings merged in from viewer-release

indra/llprimitive/llmodel.cpp

@@ -191,7 +191,7 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa
 	U32 tc_count     = (tc_source && tc_source->getFloat_array()) 		? tc.getCount()	: 0;
 	U32 norm_count   = (norm_source && norm_source->getFloat_array()) 	? n.getCount(): 0;
 
-	if ((vertex_count == 0))
+	if (vertex_count == 0)
 	{
 		LL_WARNS() << "Unable to process mesh with empty position array; invalid model." << LL_ENDL;
 		return LLModel::BAD_ELEMENT;

indra/newview/llvoavatarself.cpp

@@ -158,8 +158,7 @@ LLVOAvatarSelf::LLVOAvatarSelf(const LLUUID& id,
 	LLVOAvatar(id, pcode, regionp),
 	mScreenp(NULL),
 	mLastRegionHandle(0),
-	mRegionCrossingCount(0),
-	mInitialBakesLoaded(false)
+	mRegionCrossingCount(0)
 {
 	mMotionController.mIsSelf = TRUE;
 

indra/newview/llvoavatarself.h

@@ -105,7 +105,6 @@ class LLVOAvatarSelf :
 
 private:
 	LLUUID mInitialBakeIDs[6];
-	bool mInitialBakesLoaded;
 
 
 /********************************************************************************