livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MAINT-8742] - fix color/tint on universal tattoos

master
Anchor Linden 2018-06-27 03:08:06 +05:30
parent 69b2add00a
commit 8a13530ce4
3 changed files with 278 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llappearance/llavatarappearance.cpp
View File

@ -1476,6 +1476,10 @@ BOOL LLAvatarAppearance::teToColorParams( ETextureIndex te, U32 *param_name )
case TEX_HEAD_TATTOO:
case TEX_LOWER_TATTOO:
case TEX_UPPER_TATTOO:
param_name[0] = 1071; //"tattoo_red";
param_name[1] = 1072; //"tattoo_green";
param_name[2] = 1073; //"tattoo_blue";
break;
case TEX_HEAD_UNIVERSAL_TATTOO:
case TEX_UPPER_UNIVERSAL_TATTOO:
case TEX_LOWER_UNIVERSAL_TATTOO:
@ -1487,9 +1491,9 @@ BOOL LLAvatarAppearance::teToColorParams( ETextureIndex te, U32 *param_name )
case TEX_AUX1_TATTOO:
case TEX_AUX2_TATTOO:
case TEX_AUX3_TATTOO:
param_name[0] = 1071; //"tattoo_red";
param_name[1] = 1072; //"tattoo_green";
param_name[2] = 1073; //"tattoo_blue";
param_name[0] = 1029; //"tattoo_universal_red";
param_name[1] = 1030; //"tattoo_universal_green";
param_name[2] = 1031; //"tattoo_universal_blue";
break;
default:

270
indra/newview/character/avatar_lad.xml
View File

@ -16632,7 +16632,277 @@ render_pass="bump">
</param_driver>
</param>
<param
id="1029"
group="2"
wearable="universal"
edit_group="colorpicker"
name="tattoo_universal_red"
value_min="0"
value_max="1"
value_default="1">
<param_driver>
<driven
id="1229"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1232"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1235"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1208"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1211"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="924"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1214"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1217"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1220"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1223"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1226"
min1="0"
max1="1"
max2="1"
min2="1" />
</param_driver>
</param>
<param
id="1030"
group="2"
wearable="universal"
edit_group="colorpicker"
name="tattoo_universal_green"
value_min="0"
value_max="1"
value_default="1">
<param_driver>
<driven
id="1230"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1233"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1236"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1209"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1212"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="925"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1215"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1218"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1221"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1224"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1227"
min1="0"
max1="1"
max2="1"
min2="1" />
</param_driver>
</param>
<param
id="1031"
group="2"
wearable="universal"
edit_group="colorpicker"
name="tattoo_universal_blue"
value_min="0"
value_max="1"
value_default="1">
<param_driver>
<driven
id="1231"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1234"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1237"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1210"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1213"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="926"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1216"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1219"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1222"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1225"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1228"
min1="0"
max1="1"
max2="1"
min2="1" />
</param_driver>
</param>
<!-- ==PHYSICS PARAMETERS======================================= -->
<param
id="1100"

1
indra/newview/llpaneleditwearable.cpp
View File

@ -339,6 +339,7 @@ LLEditWearableDictionary::ColorSwatchCtrls::ColorSwatchCtrls()
addEntry ( TEX_UPPER_UNDERSHIRT, new PickerControlEntry (TEX_UPPER_UNDERSHIRT, "Color/Tint" ));
addEntry ( TEX_LOWER_UNDERPANTS, new PickerControlEntry (TEX_LOWER_UNDERPANTS, "Color/Tint" ));
addEntry ( TEX_HEAD_TATTOO, new PickerControlEntry(TEX_HEAD_TATTOO, "Color/Tint" ));
addEntry (TEX_HEAD_UNIVERSAL_TATTOO, new PickerControlEntry(TEX_HEAD_UNIVERSAL_TATTOO, "Color/Tint"));
}
LLEditWearableDictionary::TextureCtrls::TextureCtrls()