Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).

No conflicts in the merge.

Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .

1 files changed, 2 insertions, 20 deletions

diff --git a/indra/newview/llfloateravatartextures.h b/indra/newview/llfloateravatartextures.h
index fbcf47bf7d..4138edeb4d 100644
--- a/indra/newview/llfloateravatartextures.h
+++ b/indra/newview/llfloateravatartextures.h
@@ -36,6 +36,7 @@
 #include "llfloater.h"
 #include "lluuid.h"
 #include "llstring.h"
+#include "llvoavatardefines.h"
 
 class LLTextureCtrl;
 
@@ -58,26 +59,7 @@ private:
 private:
 	LLUUID	mID;
 	std::string mTitle;
-	LLTextureCtrl* mBakedHead;
-	LLTextureCtrl* mBakedEyes;
-	LLTextureCtrl* mBakedUpper;
-	LLTextureCtrl* mBakedLower;
-	LLTextureCtrl* mBakedSkirt;
-	LLTextureCtrl* mHair;
-	LLTextureCtrl* mMakeup;
-	LLTextureCtrl* mEye;
-	LLTextureCtrl* mShirt;
-	LLTextureCtrl* mUpperTattoo;
-	LLTextureCtrl* mUpperJacket;
-	LLTextureCtrl* mGloves;
-	LLTextureCtrl* mUndershirt;
-	LLTextureCtrl* mPants;
-	LLTextureCtrl* mLowerTattoo;
-	LLTextureCtrl* mShoes;
-	LLTextureCtrl* mSocks;
-	LLTextureCtrl* mJacket;
-	LLTextureCtrl* mUnderpants;
-	LLTextureCtrl* mSkirt;
+	LLTextureCtrl* mTextures[LLVOAvatarDefines::TEX_NUM_INDICES];
 };
 
 #endif