1 files changed, 12 insertions, 44 deletions

diff --git a/indra/newview/llfloateravatartextures.cpp b/indra/newview/llfloateravatartextures.cpp
index 6ff34fbfb9..e81b5d7fce 100644
--- a/indra/newview/llfloateravatartextures.cpp
+++ b/indra/newview/llfloateravatartextures.cpp
@@ -40,6 +40,8 @@
 #include "llviewerobjectlist.h"
 #include "llvoavatar.h"
 
+using namespace LLVOAvatarDefines;
+
 LLFloaterAvatarTextures::LLFloaterAvatarTextures(const LLUUID& id) : 
 	LLFloater(std::string("avatar_texture_debug")),
 	mID(id)
@@ -68,26 +70,11 @@ LLFloaterAvatarTextures* LLFloaterAvatarTextures::show(const LLUUID &id)
 
 BOOL LLFloaterAvatarTextures::postBuild()
 {
-	mBakedHead = getChild<LLTextureCtrl>("baked_head");
-	mBakedEyes = getChild<LLTextureCtrl>("baked_eyes");
-	mBakedUpper = getChild<LLTextureCtrl>("baked_upper_body");
-	mBakedLower = getChild<LLTextureCtrl>("baked_lower_body");
-	mBakedSkirt = getChild<LLTextureCtrl>("baked_skirt");
-	mHair = getChild<LLTextureCtrl>("hair");
-	mMakeup = getChild<LLTextureCtrl>("head_bodypaint");
-	mEye = getChild<LLTextureCtrl>("eye_texture");
-	mShirt = getChild<LLTextureCtrl>("shirt");
-	mUpperTattoo = getChild<LLTextureCtrl>("upper_bodypaint");
-	mUpperJacket = getChild<LLTextureCtrl>("upper_jacket");
-	mGloves = getChild<LLTextureCtrl>("gloves");
-	mUndershirt = getChild<LLTextureCtrl>("undershirt");
-	mPants = getChild<LLTextureCtrl>("pants");
-	mLowerTattoo = getChild<LLTextureCtrl>("lower_bodypaint");
-	mShoes = getChild<LLTextureCtrl>("shoes");
-	mSocks = getChild<LLTextureCtrl>("socks");
-	mJacket = getChild<LLTextureCtrl>("jacket");
-	mUnderpants = getChild<LLTextureCtrl>("underpants");
-	mSkirt = getChild<LLTextureCtrl>("skirt_texture");
+	for (U32 i=0; i < TEX_NUM_INDICES; i++)
+	{
+		const std::string tex_name = LLVOAvatarDictionary::getInstance()->getTexture(ETextureIndex(i))->mName;
+		mTextures[i] = getChild<LLTextureCtrl>(tex_name);
+	}
 	mTitle = getTitle();
 
 	childSetAction("Dump", onClickDump, this);
@@ -105,7 +92,7 @@ void LLFloaterAvatarTextures::draw()
 #if !LL_RELEASE_FOR_DOWNLOAD
 static void update_texture_ctrl(LLVOAvatar* avatarp,
 								 LLTextureCtrl* ctrl,
-								 LLVOAvatar::ETextureIndex te)
+								 ETextureIndex te)
 {
 	LLUUID id = avatarp->getTE(te)->getID();
 	if (id == IMG_DEFAULT_AVATAR)
@@ -148,29 +135,10 @@ void LLFloaterAvatarTextures::refresh()
 		{
 			setTitle(mTitle + ": " + fullname);
 		}
-		update_texture_ctrl(avatarp, mBakedHead,	LLVOAvatar::TEX_HEAD_BAKED);
-		update_texture_ctrl(avatarp, mBakedEyes,	LLVOAvatar::TEX_EYES_BAKED);
-		update_texture_ctrl(avatarp, mBakedUpper,	LLVOAvatar::TEX_UPPER_BAKED);
-		update_texture_ctrl(avatarp, mBakedLower,	LLVOAvatar::TEX_LOWER_BAKED);
-		update_texture_ctrl(avatarp, mBakedSkirt,	LLVOAvatar::TEX_SKIRT_BAKED);
-
-		update_texture_ctrl(avatarp, mMakeup,		LLVOAvatar::TEX_HEAD_BODYPAINT);
-		update_texture_ctrl(avatarp, mHair,			LLVOAvatar::TEX_HAIR);
-		update_texture_ctrl(avatarp, mEye,			LLVOAvatar::TEX_EYES_IRIS);
-
-		update_texture_ctrl(avatarp, mShirt,		LLVOAvatar::TEX_UPPER_SHIRT);
-		update_texture_ctrl(avatarp, mUpperTattoo,	LLVOAvatar::TEX_UPPER_BODYPAINT);
-		update_texture_ctrl(avatarp, mUpperJacket,	LLVOAvatar::TEX_UPPER_JACKET);
-		update_texture_ctrl(avatarp, mGloves,		LLVOAvatar::TEX_UPPER_GLOVES);
-		update_texture_ctrl(avatarp, mUndershirt,	LLVOAvatar::TEX_UPPER_UNDERSHIRT);
-
-		update_texture_ctrl(avatarp, mPants,		LLVOAvatar::TEX_LOWER_PANTS);
-		update_texture_ctrl(avatarp, mLowerTattoo,	LLVOAvatar::TEX_LOWER_BODYPAINT);
-		update_texture_ctrl(avatarp, mShoes,		LLVOAvatar::TEX_LOWER_SHOES);
-		update_texture_ctrl(avatarp, mSocks,		LLVOAvatar::TEX_LOWER_SOCKS);
-		update_texture_ctrl(avatarp, mJacket,		LLVOAvatar::TEX_LOWER_JACKET);
-		update_texture_ctrl(avatarp, mUnderpants,	LLVOAvatar::TEX_LOWER_UNDERPANTS);
-		update_texture_ctrl(avatarp, mSkirt,		LLVOAvatar::TEX_SKIRT);
+		for (U32 i=0; i < TEX_NUM_INDICES; i++)
+		{
+			update_texture_ctrl(avatarp, mTextures[i], ETextureIndex(i));
+		}
 	}
 	else
 	{