Update: Henri Beauchamp: Port of SG-2.0 alpha and tattoo layers v6->v9

issue tattoo tinting does not work

1 files changed, 3 insertions, 5 deletions

diff --git a/linden/indra/newview/llfloatercustomize.cpp b/linden/indra/newview/llfloatercustomize.cpp
index db51556..21dfc36 100644
--- a/linden/indra/newview/llfloatercustomize.cpp
+++ b/linden/indra/newview/llfloatercustomize.cpp
@@ -448,9 +448,7 @@ LLPanelEditWearable::LLPanelEditWearable( EWearableType type )
 BOOL LLPanelEditWearable::postBuild()
 {
         LLAssetType::EType asset_type = LLWearable::typeToAssetType( mType );
-        std::string icon_name = (asset_type == LLAssetType::AT_CLOTHING ?
-                                                                                 "inv_item_clothing.tga" :
-                                                                                 "inv_item_skin.tga" );
+        std::string icon_name = get_item_icon_name(asset_type, LLInventoryType::IT_WEARABLE, mType, FALSE);
         childSetValue("icon", icon_name);
 
         childSetAction("Create New", LLPanelEditWearable::onBtnCreateNew, this );
@@ -553,7 +551,7 @@ void LLPanelEditWearable::setSubpart( ESubpart subpart )
                         param = (LLViewerVisualParam *)avatar->getNextVisualParam())
                 {
                         if (param->getID() == -1
-                                || param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE 
+                                || !param->isTweakable()
                                 || param->getEditGroup() != part->mEditGroup 
                                 || !(param->getSex() & avatar_sex))
                         {
@@ -763,7 +761,6 @@ void LLPanelEditWearable::onColorCommit( LLUICtrl* ctrl, void* userdata )
         }
 }
 
-
 void LLPanelEditWearable::initPreviousTextureList()
 {
         initPreviousTextureListEntry(TEX_LOWER_ALPHA);
@@ -2338,6 +2335,7 @@ void LLFloaterCustomize::initWearablePanels()
                 panel->addTextureDropTarget(TEX_HEAD_TATTOO, "Head Tattoo",
                                                                         LLUUID::null,
                                                                         TRUE);
+                panel->addColorSwatch(TEX_LOWER_TATTOO, "Color/Tint");
         }
 }