[DRTVWR-455] - added 5 new bake channels

1 files changed, 82 insertions, 7 deletions

diff --git a/indra/llappearance/llavatarappearancedefines.cpp b/indra/llappearance/llavatarappearancedefines.cpp
index c9b975a9cc..3e91b47c07 100644
--- a/indra/llappearance/llavatarappearancedefines.cpp
+++ b/indra/llappearance/llavatarappearancedefines.cpp
@@ -65,6 +65,15 @@ LLAvatarAppearanceDictionary::Textures::Textures()
 	addEntry(TEX_HEAD_TATTOO,                 new TextureEntry("head_tattoo",      TRUE,  BAKED_NUM_INDICES, "",     LLWearableType::WT_TATTOO));
 	addEntry(TEX_UPPER_TATTOO,                new TextureEntry("upper_tattoo",     TRUE,  BAKED_NUM_INDICES, "",     LLWearableType::WT_TATTOO));
 	addEntry(TEX_LOWER_TATTOO,                new TextureEntry("lower_tattoo",     TRUE,  BAKED_NUM_INDICES, "",     LLWearableType::WT_TATTOO));
+	addEntry(TEX_SKIRT_TATTOO,				  new TextureEntry("skirt_tattoo",	   TRUE,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_TATTOO));
+	addEntry(TEX_HAIR_TATTOO,				  new TextureEntry("hair_tattoo",	   TRUE,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_TATTOO));
+	addEntry(TEX_EYES_TATTOO,				  new TextureEntry("eyes_tattoo",      TRUE,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_TATTOO));
+	addEntry(TEX_LEFT_ARM_TATTOO,			  new TextureEntry("leftarm_tattoo",   TRUE,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_TATTOO));
+	addEntry(TEX_LEFT_LEG_TATTOO,			  new TextureEntry("leftleg_tattoo",   TRUE,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_TATTOO));
+	addEntry(TEX_AUX1_TATTOO,				  new TextureEntry("aux1_tattoo",      TRUE,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_TATTOO));
+	addEntry(TEX_AUX2_TATTOO,				  new TextureEntry("aux2_tattoo",      TRUE,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_TATTOO));
+	addEntry(TEX_AUX3_TATTOO,				  new TextureEntry("aux3_tattoo",      TRUE,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_TATTOO));
+
 
 	addEntry(TEX_HEAD_BAKED,                  new TextureEntry("head-baked",       FALSE, BAKED_HEAD, "head"));
 	addEntry(TEX_UPPER_BAKED,                 new TextureEntry("upper-baked",      FALSE, BAKED_UPPER, "upper"));
@@ -72,6 +81,11 @@ LLAvatarAppearanceDictionary::Textures::Textures()
 	addEntry(TEX_EYES_BAKED,                  new TextureEntry("eyes-baked",       FALSE, BAKED_EYES, "eyes"));
 	addEntry(TEX_HAIR_BAKED,                  new TextureEntry("hair-baked",       FALSE, BAKED_HAIR, "hair"));
 	addEntry(TEX_SKIRT_BAKED,                 new TextureEntry("skirt-baked",      FALSE, BAKED_SKIRT, "skirt"));
+	addEntry(TEX_LEFT_ARM_BAKED,			  new TextureEntry("leftarm-baked",   FALSE, BAKED_LEFT_ARM, "leftarm"));
+	addEntry(TEX_LEFT_LEG_BAKED,		      new TextureEntry("leftleg-baked",  FALSE, BAKED_LEFT_LEG, "leftleg"));
+	addEntry(TEX_AUX1_BAKED,				  new TextureEntry("aux1-baked",	   FALSE, BAKED_AUX1, "aux1"));
+	addEntry(TEX_AUX2_BAKED,				  new TextureEntry("aux2-baked",	   FALSE, BAKED_AUX2, "aux2"));
+	addEntry(TEX_AUX3_BAKED,				  new TextureEntry("aux3-baked",	   FALSE, BAKED_AUX3, "aux3"));
 }
 
 LLAvatarAppearanceDictionary::BakedTextures::BakedTextures()
@@ -96,18 +110,43 @@ LLAvatarAppearanceDictionary::BakedTextures::BakedTextures()
 
 	addEntry(BAKED_EYES,       new BakedEntry(TEX_EYES_BAKED,  
 											  "eyes", "27b1bc0f-979f-4b13-95fe-b981c2ba9788",
-											  2, TEX_EYES_IRIS, TEX_EYES_ALPHA,
-											  2, LLWearableType::WT_EYES, LLWearableType::WT_ALPHA));
+											  3, TEX_EYES_IRIS, TEX_EYES_TATTOO, TEX_EYES_ALPHA,
+											  3, LLWearableType::WT_EYES, LLWearableType::WT_TATTOO, LLWearableType::WT_ALPHA));
 
 	addEntry(BAKED_SKIRT,      new BakedEntry(TEX_SKIRT_BAKED,
 											  "skirt", "03e7e8cb-1368-483b-b6f3-74850838ba63", 
-											  1, TEX_SKIRT,
-											  1, LLWearableType::WT_SKIRT));
+											  2, TEX_SKIRT, TEX_SKIRT_TATTOO,
+											  2, LLWearableType::WT_SKIRT, LLWearableType::WT_TATTOO ));
 
 	addEntry(BAKED_HAIR,       new BakedEntry(TEX_HAIR_BAKED,
 											  "hair", "a60e85a9-74e8-48d8-8a2d-8129f28d9b61", 
-											  2, TEX_HAIR, TEX_HAIR_ALPHA,
-											  2, LLWearableType::WT_HAIR, LLWearableType::WT_ALPHA));
+											  3, TEX_HAIR, TEX_HAIR_TATTOO, TEX_HAIR_ALPHA,
+											  3, LLWearableType::WT_HAIR, LLWearableType::WT_TATTOO, LLWearableType::WT_ALPHA));
+
+	addEntry(BAKED_LEFT_ARM, new BakedEntry(TEX_LEFT_ARM_BAKED,
+		"leftarm", "9f39febf-22d7-0087-79d1-e9e8c6c9ed19",
+		1, TEX_LEFT_ARM_TATTOO,
+		1, LLWearableType::WT_TATTOO));
+
+	addEntry(BAKED_LEFT_LEG, new BakedEntry(TEX_LEFT_LEG_BAKED,
+		"leftleg", "054a7a58-8ed5-6386-0add-3b636fb28b78",
+		1, TEX_LEFT_LEG_TATTOO,
+		1, LLWearableType::WT_TATTOO));
+
+	addEntry(BAKED_AUX1, new BakedEntry(TEX_AUX1_BAKED,
+		"aux1", "790c11be-b25c-c17e-b4d2-6a4ad786b752",
+		1, TEX_AUX1_TATTOO,
+		1, LLWearableType::WT_TATTOO));
+
+	addEntry(BAKED_AUX2, new BakedEntry(TEX_AUX2_BAKED,
+		"aux2", "d78c478f-48c7-5928-5864-8d99fb1f521e",
+		1, TEX_AUX2_TATTOO,
+		1, LLWearableType::WT_TATTOO));
+
+	addEntry(BAKED_AUX3, new BakedEntry(TEX_AUX3_BAKED,
+		"aux3", "6a95dd53-edd9-aac8-f6d3-27ed99f3c3eb",
+		1, TEX_AUX3_TATTOO,
+		1, LLWearableType::WT_TATTOO));
 }
 
 LLAvatarAppearanceDictionary::MeshEntries::MeshEntries()
@@ -270,7 +309,8 @@ LLWearableType::EType LLAvatarAppearanceDictionary::getTEWearableType(ETextureIn
 // static
 BOOL LLAvatarAppearanceDictionary::isBakedImageId(const LLUUID& id)
 {
-	if ((id == IMG_USE_BAKED_EYES) || (id == IMG_USE_BAKED_HAIR) || (id == IMG_USE_BAKED_HEAD) || (id == IMG_USE_BAKED_LOWER) || (id == IMG_USE_BAKED_SKIRT) || (id == IMG_USE_BAKED_UPPER))
+	if ((id == IMG_USE_BAKED_EYES) || (id == IMG_USE_BAKED_HAIR) || (id == IMG_USE_BAKED_HEAD) || (id == IMG_USE_BAKED_LOWER) || (id == IMG_USE_BAKED_SKIRT) || (id == IMG_USE_BAKED_UPPER) 
+		|| (id == IMG_USE_BAKED_LEFTARM) || (id == IMG_USE_BAKED_LEFTLEG) || (id == IMG_USE_BAKED_AUX1) || (id == IMG_USE_BAKED_AUX2) || (id == IMG_USE_BAKED_AUX3) )
 	{
 		return TRUE;
 	}
@@ -305,6 +345,26 @@ EBakedTextureIndex LLAvatarAppearanceDictionary::assetIdToBakedTextureIndex(cons
 	{
 		return BAKED_UPPER;
 	}
+	else if (id == IMG_USE_BAKED_LEFTARM)
+	{
+		return BAKED_LEFT_ARM;
+	}
+	else if (id == IMG_USE_BAKED_LEFTLEG)
+	{
+		return BAKED_LEFT_LEG;
+	}
+	else if (id == IMG_USE_BAKED_AUX1)
+	{
+		return BAKED_AUX1;
+	}
+	else if (id == IMG_USE_BAKED_AUX2)
+	{
+		return BAKED_AUX2;
+	}
+	else if (id == IMG_USE_BAKED_AUX3)
+	{
+		return BAKED_AUX3;
+	}
 
 	return BAKED_NUM_INDICES;
 }
@@ -334,6 +394,21 @@ LLUUID LLAvatarAppearanceDictionary::localTextureIndexToMagicId(ETextureIndex t)
 	case LLAvatarAppearanceDefines::TEX_HAIR_BAKED:
 		id = IMG_USE_BAKED_HAIR;
 		break;
+	case LLAvatarAppearanceDefines::TEX_LEFT_ARM_BAKED:
+		id = IMG_USE_BAKED_LEFTARM;
+		break;
+	case LLAvatarAppearanceDefines::TEX_LEFT_LEG_BAKED:
+		id = IMG_USE_BAKED_LEFTLEG;
+		break;
+	case LLAvatarAppearanceDefines::TEX_AUX1_BAKED:
+		id = IMG_USE_BAKED_AUX1;
+		break;
+	case LLAvatarAppearanceDefines::TEX_AUX2_BAKED:
+		id = IMG_USE_BAKED_AUX2;
+		break;
+	case LLAvatarAppearanceDefines::TEX_AUX3_BAKED:
+		id = IMG_USE_BAKED_AUX3;
+		break;
 	default:
 		break;
 	}