From 9dfe0ca9a0228c4fa75c8a3e51840696cc6b4960 Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Fri, 22 May 2009 09:58:47 +0000
Subject: svn merge -r121194:121210
 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1

QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
---
 indra/newview/llvoavatar.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/llvoavatar.h')

diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 50eec80ba7..f8b2c068ff 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -699,6 +699,7 @@ private:
 		LLUUID			mLastTextureIndex;
 		LLTexLayerSet*	mTexLayerSet;
 		bool			mIsLoaded;
+		bool			mIsUsed;
 		LLVOAvatarDefines::ETextureIndex	mTextureIndex;
 		U32				mMaskTexName;
 		// Stores pointers to the joint meshes that this baked texture deals with
-- 
cgit v1.2.3