merging in new wearable infrastructure to get a step closer to eventually supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command:

svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 .

Progress can be tracked in DEV-32551.

 -Nyx

1 files changed, 6 insertions, 4 deletions

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index c2def610dc..2e45a61f1b 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -6910,11 +6910,12 @@ void handle_debug_avatar_textures(void*)
 
 void handle_grab_texture(void* data)
 {
-	ETextureIndex index = (ETextureIndex)((intptr_t)data);
+	ETextureIndex tex_index = (ETextureIndex)((intptr_t)data);
 	const LLVOAvatarSelf* avatar = gAgent.getAvatarObject();
 	if ( avatar )
 	{
-		const LLUUID& asset_id = avatar->grabLocalTexture(index);
+		// MULTI-WEARABLE: change to support an index
+		const LLUUID& asset_id = avatar->grabLocalTexture(tex_index, 0);
 		LL_INFOS("texture") << "Adding baked texture " << asset_id << " to inventory." << llendl;
 		LLAssetType::EType asset_type = LLAssetType::AT_TEXTURE;
 		LLInventoryType::EType inv_type = LLInventoryType::IT_TEXTURE;
@@ -6922,7 +6923,7 @@ void handle_grab_texture(void* data)
 		if(folder_id.notNull())
 		{
 			std::string name = "Unknown";
-			const LLVOAvatarDictionary::TextureEntry *texture_dict = LLVOAvatarDictionary::getInstance()->getTexture(index);
+			const LLVOAvatarDictionary::TextureEntry *texture_dict = LLVOAvatarDictionary::getInstance()->getTexture(tex_index);
 			if (texture_dict->mIsBakedTexture)
 			{
 				EBakedTextureIndex baked_index = texture_dict->mBakedTextureIndex;
@@ -6989,7 +6990,8 @@ BOOL enable_grab_texture(void* data)
 	const LLVOAvatarSelf* avatar = gAgent.getAvatarObject();
 	if ( avatar )
 	{
-		return avatar->canGrabLocalTexture(index);
+		// MULTI-WEARABLE:
+		return avatar->canGrabLocalTexture(index,0);
 	}
 	return FALSE;
 }