Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tintable tattoo layers - Another Shyotl patch.

Browse Source 
Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-17 19:10:10 -04:00
parent 7f467b7819
commit ed942cfe74
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloatercustomize.cpp
View File

@@ -450,10 +450,13 @@ LLPanelEditWearable::LLPanelEditWearable( EWearableType type )
BOOL LLPanelEditWearable::postBuild() BOOL LLPanelEditWearable::postBuild()
{ {
LLAssetType::EType asset_type = LLWearable::typeToAssetType( mType ); LLAssetType::EType asset_type = LLWearable::typeToAssetType( mType );
std::string icon_name = (asset_type == LLAssetType::AT_CLOTHING ? /*std::string icon_name = (asset_type == LLAssetType::AT_CLOTHING ?
"inv_item_clothing.tga" : "inv_item_clothing.tga" :
"inv_item_skin.tga" ); "inv_item_skin.tga" );*/
childSetValue("icon", icon_name); std::string icon_name = get_item_icon_name(asset_type,LLInventoryType::IT_WEARABLE,mType,FALSE);
childSetValue("icon", icon_name);
childSetValue("icon", icon_name);
childSetAction("Create New", LLPanelEditWearable::onBtnCreateNew, this ); childSetAction("Create New", LLPanelEditWearable::onBtnCreateNew, this );
@@ -2210,6 +2213,7 @@ void LLFloaterCustomize::initWearablePanels()
part->mTargetOffset.setVec(0.f, 0.f, 0.1f); part->mTargetOffset.setVec(0.f, 0.f, 0.1f);
part->mCameraOffset.setVec(-2.5f, 0.5f, 0.8f); part->mCameraOffset.setVec(-2.5f, 0.5f, 0.8f);
panel->addSubpart(LLStringUtil::null, SUBPART_TATTOO, part); panel->addSubpart(LLStringUtil::null, SUBPART_TATTOO, part);
panel->addColorSwatch(TEX_LOWER_TATTOO, "Color/Tint");
panel->addTextureDropTarget(TEX_LOWER_TATTOO, "Lower Tattoo", panel->addTextureDropTarget(TEX_LOWER_TATTOO, "Lower Tattoo",
LLUUID::null, LLUUID::null,

9
indra/newview/llvoavatar.cpp
View File

@@ -1525,6 +1525,7 @@ void LLVOAvatar::initClass()
} }
{ {
updateClientTags();
loadClientTags(); loadClientTags();
} }
} }
@@ -8589,6 +8590,14 @@ BOOL LLVOAvatar::teToColorParams( ETextureIndex te, const char* param_name[3] )
param_name[2] = "skirt_blue"; param_name[2] = "skirt_blue";
break; break;
case TEX_HEAD_TATTOO:
case TEX_LOWER_TATTOO:
case TEX_UPPER_TATTOO:
param_name[0] = "tattoo_red";
param_name[1] = "tattoo_green";
param_name[2] = "tattoo_blue";
break;
default: default:
llassert(0); llassert(0);
return FALSE; return FALSE;

6
indra/newview/skins/default/xui/en-us/floater_customize.xml
View File

@@ -1190,11 +1190,15 @@ scratch and wear it.
<texture_picker name="Lower Tattoo" label="Lower Tattoo" tool_tip="Click to choose a picture" <texture_picker name="Lower Tattoo" label="Lower Tattoo" tool_tip="Click to choose a picture"
can_apply_immediately="true" default_image_name="Default" allow_no_texture="true" can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
follows="left|top" width="70" height="80" left="14" bottom="-325"/> follows="left|top" width="70" height="80" left="14" bottom="-325"/>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-415"
can_apply_immediately="true" color="1 1 1 1" follows="left|top" height="80"
label="Color/Tint" left="14" mouse_opaque="true" name="Color/Tint"
tool_tip="Click to open Color Picker" width="70" />
<button name="Create New" label="Create New Tattoo" label_selected="Create New Tattoo" <button name="Create New" label="Create New Tattoo" label_selected="Create New Tattoo"
follows="left|top" halign="center" width="170" height="24" left="8" bottom="-128" follows="left|top" halign="center" width="170" height="24" left="8" bottom="-128"
mouse_opaque="true" scale_image="true"/> mouse_opaque="true" scale_image="true"/>
<button name="Take Off" label="Take Off" label_selected="Take Off" <button name="Take Off" label="Take Off" label_selected="Take Off"
follows="left|top" width="82" height="20" left="8" bottom="-365"/> follows="left|top" width="82" height="20" left="8" bottom="-440"/>
<button name="Save" label="Save" label_selected="Save" <button name="Save" label="Save" label_selected="Save"
follows="right|bottom" width="82" height="20" left="123" bottom="-478"/> follows="right|bottom" width="82" height="20" left="123" bottom="-478"/>
<button name="Save As" label="Save As..." label_selected="Save As..." <button name="Save As" label="Save As..." label_selected="Save As..."