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

Merge viewer-baking-updates

master
Ansariel 2018-06-16 13:22:49 +02:00
parent 60ba289fbf 7abb0c99be
commit 4aa45cb8e1
49 changed files with 908 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llappearance/llavatarappearance.cpp
View File

@ -1498,6 +1498,9 @@ BOOL LLAvatarAppearance::teToColorParams( ETextureIndex te, U32 *param_name )
case TEX_HEAD_TATTOO:
case TEX_LOWER_TATTOO:
case TEX_UPPER_TATTOO:
case TEX_HEAD_UNIVERSAL_TATTOO:
case TEX_UPPER_UNIVERSAL_TATTOO:
case TEX_LOWER_UNIVERSAL_TATTOO:
case TEX_SKIRT_TATTOO:
case TEX_HAIR_TATTOO:
case TEX_EYES_TATTOO:

52
indra/llappearance/llavatarappearancedefines.cpp
View File

@ -65,14 +65,18 @@ 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_UNIVERSAL_TATTOO, new TextureEntry("head_universal_tattoo", TRUE, BAKED_NUM_INDICES, "", LLWearableType::WT_UNIVERSAL));
addEntry(TEX_UPPER_UNIVERSAL_TATTOO, new TextureEntry("upper_universal_tattoo", TRUE, BAKED_NUM_INDICES, "", LLWearableType::WT_UNIVERSAL));
addEntry(TEX_LOWER_UNIVERSAL_TATTOO, new TextureEntry("lower_universal_tattoo", TRUE, BAKED_NUM_INDICES, "", LLWearableType::WT_UNIVERSAL));
addEntry(TEX_SKIRT_TATTOO, new TextureEntry("skirt_tattoo", TRUE, BAKED_NUM_INDICES, "", LLWearableType::WT_UNIVERSAL));
addEntry(TEX_HAIR_TATTOO, new TextureEntry("hair_tattoo", TRUE, BAKED_NUM_INDICES, "", LLWearableType::WT_UNIVERSAL));
addEntry(TEX_EYES_TATTOO, new TextureEntry("eyes_tattoo", TRUE, BAKED_NUM_INDICES, "", LLWearableType::WT_UNIVERSAL));
addEntry(TEX_LEFT_ARM_TATTOO, new TextureEntry("leftarm_tattoo", TRUE, BAKED_NUM_INDICES, "", LLWearableType::WT_UNIVERSAL));
addEntry(TEX_LEFT_LEG_TATTOO, new TextureEntry("leftleg_tattoo", TRUE, BAKED_NUM_INDICES, "", LLWearableType::WT_UNIVERSAL));
addEntry(TEX_AUX1_TATTOO, new TextureEntry("aux1_tattoo", TRUE, BAKED_NUM_INDICES, "", LLWearableType::WT_UNIVERSAL));
addEntry(TEX_AUX2_TATTOO, new TextureEntry("aux2_tattoo", TRUE, BAKED_NUM_INDICES, "", LLWearableType::WT_UNIVERSAL));
addEntry(TEX_AUX3_TATTOO, new TextureEntry("aux3_tattoo", TRUE, BAKED_NUM_INDICES, "", LLWearableType::WT_UNIVERSAL));
addEntry(TEX_HEAD_BAKED, new TextureEntry("head-baked", FALSE, BAKED_HEAD, "head"));
@ -93,60 +97,60 @@ LLAvatarAppearanceDictionary::BakedTextures::BakedTextures()
// Baked textures
addEntry(BAKED_HEAD, new BakedEntry(TEX_HEAD_BAKED,
"head", "a4b9dc38-e13b-4df9-b284-751efb0566ff",
3, TEX_HEAD_BODYPAINT, TEX_HEAD_TATTOO, TEX_HEAD_ALPHA,
5, LLWearableType::WT_SHAPE, LLWearableType::WT_SKIN, LLWearableType::WT_HAIR, LLWearableType::WT_TATTOO, LLWearableType::WT_ALPHA));
4, TEX_HEAD_BODYPAINT, TEX_HEAD_TATTOO, TEX_HEAD_ALPHA, TEX_HEAD_UNIVERSAL_TATTOO,
6, LLWearableType::WT_SHAPE, LLWearableType::WT_SKIN, LLWearableType::WT_HAIR, LLWearableType::WT_TATTOO, LLWearableType::WT_ALPHA, LLWearableType::WT_UNIVERSAL));
addEntry(BAKED_UPPER, new BakedEntry(TEX_UPPER_BAKED,
"upper_body", "5943ff64-d26c-4a90-a8c0-d61f56bd98d4",
7, TEX_UPPER_SHIRT,TEX_UPPER_BODYPAINT, TEX_UPPER_JACKET,
TEX_UPPER_GLOVES, TEX_UPPER_UNDERSHIRT, TEX_UPPER_TATTOO, TEX_UPPER_ALPHA,
8, LLWearableType::WT_SHAPE, LLWearableType::WT_SKIN, LLWearableType::WT_SHIRT, LLWearableType::WT_JACKET, LLWearableType::WT_GLOVES, LLWearableType::WT_UNDERSHIRT, LLWearableType::WT_TATTOO, LLWearableType::WT_ALPHA));
8, TEX_UPPER_SHIRT,TEX_UPPER_BODYPAINT, TEX_UPPER_JACKET,
TEX_UPPER_GLOVES, TEX_UPPER_UNDERSHIRT, TEX_UPPER_TATTOO, TEX_UPPER_ALPHA, TEX_UPPER_UNIVERSAL_TATTOO,
9, LLWearableType::WT_SHAPE, LLWearableType::WT_SKIN, LLWearableType::WT_SHIRT, LLWearableType::WT_JACKET, LLWearableType::WT_GLOVES, LLWearableType::WT_UNDERSHIRT, LLWearableType::WT_TATTOO, LLWearableType::WT_ALPHA, LLWearableType::WT_UNIVERSAL));
addEntry(BAKED_LOWER, new BakedEntry(TEX_LOWER_BAKED,
"lower_body", "2944ee70-90a7-425d-a5fb-d749c782ed7d",
8, TEX_LOWER_PANTS,TEX_LOWER_BODYPAINT,TEX_LOWER_SHOES, TEX_LOWER_SOCKS,
TEX_LOWER_JACKET, TEX_LOWER_UNDERPANTS, TEX_LOWER_TATTOO, TEX_LOWER_ALPHA,
9, LLWearableType::WT_SHAPE, LLWearableType::WT_SKIN, LLWearableType::WT_PANTS, LLWearableType::WT_SHOES, LLWearableType::WT_SOCKS, LLWearableType::WT_JACKET, LLWearableType::WT_UNDERPANTS, LLWearableType::WT_TATTOO, LLWearableType::WT_ALPHA));
9, TEX_LOWER_PANTS,TEX_LOWER_BODYPAINT,TEX_LOWER_SHOES, TEX_LOWER_SOCKS,
TEX_LOWER_JACKET, TEX_LOWER_UNDERPANTS, TEX_LOWER_TATTOO, TEX_LOWER_ALPHA, TEX_LOWER_UNIVERSAL_TATTOO,
10, LLWearableType::WT_SHAPE, LLWearableType::WT_SKIN, LLWearableType::WT_PANTS, LLWearableType::WT_SHOES, LLWearableType::WT_SOCKS, LLWearableType::WT_JACKET, LLWearableType::WT_UNDERPANTS, LLWearableType::WT_TATTOO, LLWearableType::WT_ALPHA, LLWearableType::WT_UNIVERSAL));
addEntry(BAKED_EYES, new BakedEntry(TEX_EYES_BAKED,
"eyes", "27b1bc0f-979f-4b13-95fe-b981c2ba9788",
3, TEX_EYES_IRIS, TEX_EYES_TATTOO, TEX_EYES_ALPHA,
3, LLWearableType::WT_EYES, LLWearableType::WT_TATTOO, LLWearableType::WT_ALPHA));
3, LLWearableType::WT_EYES, LLWearableType::WT_UNIVERSAL, LLWearableType::WT_ALPHA));
addEntry(BAKED_SKIRT, new BakedEntry(TEX_SKIRT_BAKED,
"skirt", "03e7e8cb-1368-483b-b6f3-74850838ba63",
2, TEX_SKIRT, TEX_SKIRT_TATTOO,
2, LLWearableType::WT_SKIRT, LLWearableType::WT_TATTOO ));
2, LLWearableType::WT_SKIRT, LLWearableType::WT_UNIVERSAL ));
addEntry(BAKED_HAIR, new BakedEntry(TEX_HAIR_BAKED,
"hair", "a60e85a9-74e8-48d8-8a2d-8129f28d9b61",
3, TEX_HAIR, TEX_HAIR_TATTOO, TEX_HAIR_ALPHA,
3, LLWearableType::WT_HAIR, LLWearableType::WT_TATTOO, LLWearableType::WT_ALPHA));
3, LLWearableType::WT_HAIR, LLWearableType::WT_UNIVERSAL, 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));
1, LLWearableType::WT_UNIVERSAL));
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));
1, LLWearableType::WT_UNIVERSAL));
addEntry(BAKED_AUX1, new BakedEntry(TEX_AUX1_BAKED,
"aux1", "790c11be-b25c-c17e-b4d2-6a4ad786b752",
1, TEX_AUX1_TATTOO,
1, LLWearableType::WT_TATTOO));
1, LLWearableType::WT_UNIVERSAL));
addEntry(BAKED_AUX2, new BakedEntry(TEX_AUX2_BAKED,
"aux2", "d78c478f-48c7-5928-5864-8d99fb1f521e",
1, TEX_AUX2_TATTOO,
1, LLWearableType::WT_TATTOO));
1, LLWearableType::WT_UNIVERSAL));
addEntry(BAKED_AUX3, new BakedEntry(TEX_AUX3_BAKED,
"aux3", "6a95dd53-edd9-aac8-f6d3-27ed99f3c3eb",
1, TEX_AUX3_TATTOO,
1, LLWearableType::WT_TATTOO));
1, LLWearableType::WT_UNIVERSAL));
}
LLAvatarAppearanceDictionary::MeshEntries::MeshEntries()

3
indra/llappearance/llavatarappearancedefines.h
View File

@ -78,6 +78,9 @@ enum ETextureIndex
TEX_HEAD_TATTOO,
TEX_UPPER_TATTOO,
TEX_LOWER_TATTOO,
TEX_HEAD_UNIVERSAL_TATTOO,
TEX_UPPER_UNIVERSAL_TATTOO,
TEX_LOWER_UNIVERSAL_TATTOO,
TEX_SKIRT_TATTOO,
TEX_HAIR_TATTOO,
TEX_EYES_TATTOO,

1
indra/llappearance/llwearabletype.cpp
View File

@ -97,6 +97,7 @@ LLWearableDictionary::LLWearableDictionary()
addEntry(LLWearableType::WT_SKIRT, new WearableEntry("skirt", "New Skirt", LLAssetType::AT_CLOTHING, LLInventoryType::ICONNAME_CLOTHING_SKIRT, FALSE, TRUE));
addEntry(LLWearableType::WT_ALPHA, new WearableEntry("alpha", "New Alpha", LLAssetType::AT_CLOTHING, LLInventoryType::ICONNAME_CLOTHING_ALPHA, FALSE, TRUE));
addEntry(LLWearableType::WT_TATTOO, new WearableEntry("tattoo", "New Tattoo", LLAssetType::AT_CLOTHING, LLInventoryType::ICONNAME_CLOTHING_TATTOO, FALSE, TRUE));
addEntry(LLWearableType::WT_UNIVERSAL, new WearableEntry("universal", "New Universal", LLAssetType::AT_CLOTHING, LLInventoryType::ICONNAME_CLOTHING_UNIVERSAL, FALSE, TRUE));
// [SL:KB] - Patch: Appearance-Misc | Checked: 2011-05-29 (Catznip-2.6)
addEntry(LLWearableType::WT_PHYSICS, new WearableEntry("physics", "New Physics", LLAssetType::AT_CLOTHING, LLInventoryType::ICONNAME_CLOTHING_PHYSICS, TRUE, FALSE));

3
indra/llappearance/llwearabletype.h
View File

@ -63,7 +63,8 @@ public:
WT_ALPHA = 13,
WT_TATTOO = 14,
WT_PHYSICS = 15,
WT_COUNT = 16,
WT_UNIVERSAL = 16,
WT_COUNT = 17,
WT_INVALID = 255,
WT_NONE = -1,

1
indra/llinventory/llinventorytype.h
View File

@ -100,6 +100,7 @@ public:
ICONNAME_CLOTHING_SKIRT,
ICONNAME_CLOTHING_ALPHA,
ICONNAME_CLOTHING_TATTOO,
ICONNAME_CLOTHING_UNIVERSAL,
ICONNAME_ANIMATION,
ICONNAME_GESTURE,

10
indra/llprimitive/llprimitive.cpp
View File

@ -1065,6 +1065,10 @@ S32 LLPrimitive::packTEField(U8 *cur_ptr, U8 *data_ptr, U8 data_size, U8 last_fa
{
if (exception_faces >= ((U64)0x1 << 42))
{
if (exception_faces >= ((U64)0x1 << 49))
{
*cur_ptr++ = (U8)(((exception_faces >> 49) & 0x7F) | 0x80);
}
*cur_ptr++ = (U8)(((exception_faces >> 42) & 0x7F) | 0x80);
}
*cur_ptr++ = (U8)(((exception_faces >> 35) & 0x7F) | 0x80);
@ -1137,7 +1141,7 @@ S32 LLPrimitive::unpackTEField(U8 *cur_ptr, U8 *buffer_end, U8 *data_ptr, U8 dat
// Includes information about image ID, color, scale S,T, offset S,T and rotation
BOOL LLPrimitive::packTEMessage(LLMessageSystem *mesgsys) const
{
const U32 MAX_TES = 42;
const U32 MAX_TES = 45;
U8 image_ids[MAX_TES*16];
U8 colors[MAX_TES*4];
@ -1223,7 +1227,7 @@ BOOL LLPrimitive::packTEMessage(LLMessageSystem *mesgsys) const
BOOL LLPrimitive::packTEMessage(LLDataPacker &dp) const
{
const U32 MAX_TES = 42;
const U32 MAX_TES = 45;
U8 image_ids[MAX_TES*16];
U8 colors[MAX_TES*4];
@ -1430,7 +1434,7 @@ S32 LLPrimitive::unpackTEMessage(LLDataPacker &dp)
{
// use a negative block_num to indicate a single-block read (a non-variable block)
S32 retval = 0;
const U32 MAX_TES = 42;
const U32 MAX_TES = 45;
// Avoid construction of 32 UUIDs per call
static LLUUID image_ids[MAX_TES];

2
indra/llprimitive/llprimitive.h
View File

@ -305,7 +305,7 @@ public:
// - Vir
struct LLTEContents
{
static const U32 MAX_TES = 42;
static const U32 MAX_TES = 45;
U8 image_data[MAX_TES*16];
U8 colors[MAX_TES*4];

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

@ -8957,7 +8957,7 @@
id="1211"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_hair_red"
value_min="0"
value_max="1"
@ -8975,7 +8975,7 @@
id="1212"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_hair_green"
value_min="0"
value_max="1"
@ -8993,7 +8993,7 @@
id="1213"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_hair_blue"
value_min="0"
value_max="1"
@ -10086,7 +10086,65 @@ render_pass="bump">
</param>
</layer>
<layer
name="head_universal_tattoo">
<texture
local_texture="head_universal_tattoo" />
<param
id="1229"
group="1"
edit_group="colorpicker_driven"
wearable="universal"
name="tattoo_head_universal_red"
value_min="0"
value_max="1"
value_default="1">
<param_color>
<value
color="0, 0, 0, 255" />
<value
color="255, 0, 0, 255" />
</param_color>
</param>
<param
id="1230"
group="1"
edit_group="colorpicker_driven"
wearable="universal"
name="tattoo_head_universal_green"
value_min="0"
value_max="1"
value_default="1">
<param_color>
<value
color="0, 0, 0, 255" />
<value
color="0, 255, 0, 255" />
</param_color>
</param>
<param
id="1231"
group="1"
edit_group="colorpicker_driven"
wearable="universal"
name="tattoo_head_universal_blue"
value_min="0"
value_max="1"
value_default="1">
<param_color>
<value
color="0, 0, 0, 255" />
<value
color="0, 0, 255, 255" />
</param_color>
</param>
</layer>
</layer_set>
@ -10263,7 +10321,65 @@ render_pass="bump">
</param>
</layer>
<layer
name="upper_universal_tattoo">
<texture
local_texture="upper_universal_tattoo" />
<param
id="1232"
group="1"
edit_group="colorpicker_driven"
wearable="universal"
name="tattoo_upper_universal_red"
value_min="0"
value_max="1"
value_default="1">
<param_color>
<value
color="0, 0, 0, 255" />
<value
color="255, 0, 0, 255" />
</param_color>
</param>
<param
id="1233"
group="1"
edit_group="colorpicker_driven"
wearable="universal"
name="tattoo_upper_universal_green"
value_min="0"
value_max="1"
value_default="1">
<param_color>
<value
color="0, 0, 0, 255" />
<value
color="0, 255, 0, 255" />
</param_color>
</param>
<param
id="1234"
group="1"
edit_group="colorpicker_driven"
wearable="universal"
name="tattoo_upper_universal_blue"
value_min="0"
value_max="1"
value_default="1">
<param_color>
<value
color="0, 0, 0, 255" />
<value
color="0, 0, 255, 255" />
</param_color>
</param>
</layer>
<layer
name="upper_undershirt bump"
@ -11515,7 +11631,65 @@ render_pass="bump">
</param>
</layer>
<layer
name="lower_universal_tattoo">
<texture
local_texture="lower_universal_tattoo" />
<param
id="1235"
group="1"
edit_group="colorpicker_driven"
wearable="universal"
name="tattoo_lower_universal_red"
value_min="0"
value_max="1"
value_default="1">
<param_color>
<value
color="0, 0, 0, 255" />
<value
color="255, 0, 0, 255" />
</param_color>
</param>
<param
id="1236"
group="1"
edit_group="colorpicker_driven"
wearable="universal"
name="tattoo_lower_universal_green"
value_min="0"
value_max="1"
value_default="1">
<param_color>
<value
color="0, 0, 0, 255" />
<value
color="0, 255, 0, 255" />
</param_color>
</param>
<param
id="1237"
group="1"
edit_group="colorpicker_driven"
wearable="universal"
name="tattoo_lower_universal_blue"
value_min="0"
value_max="1"
value_default="1">
<param_color>
<value
color="0, 0, 0, 255" />
<value
color="0, 0, 255, 255" />
</param_color>
</param>
</layer>
<layer
name="lower_underpants bump"
render_pass="bump"
@ -12305,7 +12479,7 @@ render_pass="bump">
id="924"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_eyes_red"
value_min="0"
value_max="1"
@ -12323,7 +12497,7 @@ render_pass="bump">
id="925"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_eyes_green"
value_min="0"
value_max="1"
@ -12341,7 +12515,7 @@ render_pass="bump">
id="926"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_eyes_blue"
value_min="0"
value_max="1"
@ -12545,7 +12719,7 @@ render_pass="bump">
id="1208"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_skirt_red"
value_min="0"
value_max="1"
@ -12563,7 +12737,7 @@ render_pass="bump">
id="1209"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_skirt_green"
value_min="0"
value_max="1"
@ -12581,7 +12755,7 @@ render_pass="bump">
id="1210"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_skirt_blue"
value_min="0"
value_max="1"
@ -12614,7 +12788,7 @@ render_pass="bump">
id="1214"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_leftarm_red"
value_min="0"
value_max="1"
@ -12632,7 +12806,7 @@ render_pass="bump">
id="1215"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_leftarm_green"
value_min="0"
value_max="1"
@ -12650,7 +12824,7 @@ render_pass="bump">
id="1216"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_leftarm_blue"
value_min="0"
value_max="1"
@ -12683,7 +12857,7 @@ render_pass="bump">
id="1217"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_leftleg_red"
value_min="0"
value_max="1"
@ -12701,7 +12875,7 @@ render_pass="bump">
id="1218"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_leftleg_green"
value_min="0"
value_max="1"
@ -12719,7 +12893,7 @@ render_pass="bump">
id="1219"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_leftleg_blue"
value_min="0"
value_max="1"
@ -12752,7 +12926,7 @@ render_pass="bump">
id="1220"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_aux1_red"
value_min="0"
value_max="1"
@ -12770,7 +12944,7 @@ render_pass="bump">
id="1221"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_aux1_green"
value_min="0"
value_max="1"
@ -12788,7 +12962,7 @@ render_pass="bump">
id="1222"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_aux1_blue"
value_min="0"
value_max="1"
@ -12821,7 +12995,7 @@ render_pass="bump">
id="1223"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_aux2_red"
value_min="0"
value_max="1"
@ -12839,7 +13013,7 @@ render_pass="bump">
id="1224"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_aux2_green"
value_min="0"
value_max="1"
@ -12857,7 +13031,7 @@ render_pass="bump">
id="1225"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_aux2_blue"
value_min="0"
value_max="1"
@ -12890,7 +13064,7 @@ render_pass="bump">
id="1226"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_aux3_red"
value_min="0"
value_max="1"
@ -12908,7 +13082,7 @@ render_pass="bump">
id="1227"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_aux3_green"
value_min="0"
value_max="1"
@ -12926,7 +13100,7 @@ render_pass="bump">
id="1228"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
wearable="universal"
name="tattoo_aux3_blue"
value_min="0"
value_max="1"

1
indra/newview/llinventoryicon.cpp
View File

@ -83,6 +83,7 @@ LLIconDictionary::LLIconDictionary()
addEntry(LLInventoryType::ICONNAME_CLOTHING_SKIRT, new IconEntry("Inv_Skirt"));
addEntry(LLInventoryType::ICONNAME_CLOTHING_ALPHA, new IconEntry("Inv_Alpha"));
addEntry(LLInventoryType::ICONNAME_CLOTHING_TATTOO, new IconEntry("Inv_Tattoo"));
addEntry(LLInventoryType::ICONNAME_CLOTHING_UNIVERSAL, new IconEntry("Inv_Universal"));
addEntry(LLInventoryType::ICONNAME_ANIMATION, new IconEntry("Inv_Animation"));
addEntry(LLInventoryType::ICONNAME_GESTURE, new IconEntry("Inv_Gesture"));

32
indra/newview/lllocalbitmaps.cpp
View File

@ -384,6 +384,7 @@ void LLLocalBitmap::replaceIDs(LLUUID old_id, LLUUID new_id)
updateUserLayers(old_id, new_id, LLWearableType::WT_SKIRT);
updateUserLayers(old_id, new_id, LLWearableType::WT_SOCKS);
updateUserLayers(old_id, new_id, LLWearableType::WT_TATTOO);
updateUserLayers(old_id, new_id, LLWearableType::WT_UNIVERSAL);
updateUserLayers(old_id, new_id, LLWearableType::WT_UNDERPANTS);
updateUserLayers(old_id, new_id, LLWearableType::WT_UNDERSHIRT);
}
@ -758,7 +759,7 @@ LLAvatarAppearanceDefines::ETextureIndex LLLocalBitmap::getTexIndex(
case LLWearableType::WT_TATTOO:
{
switch(baked_texind)
switch (baked_texind)
{
case LLAvatarAppearanceDefines::BAKED_HEAD:
{
@ -776,6 +777,19 @@ LLAvatarAppearanceDefines::ETextureIndex LLLocalBitmap::getTexIndex(
result = LLAvatarAppearanceDefines::TEX_UPPER_TATTOO;
break;
}
default:
{
break;
}
}
break;
}
case LLWearableType::WT_UNIVERSAL:
{
switch (baked_texind)
{
case LLAvatarAppearanceDefines::BAKED_SKIRT:
{
result = LLAvatarAppearanceDefines::TEX_SKIRT_TATTOO;
@ -816,6 +830,22 @@ LLAvatarAppearanceDefines::ETextureIndex LLLocalBitmap::getTexIndex(
result = LLAvatarAppearanceDefines::TEX_AUX3_TATTOO;
break;
}
case LLAvatarAppearanceDefines::BAKED_UPPER:
{
result = LLAvatarAppearanceDefines::TEX_UPPER_UNIVERSAL_TATTOO;
break;
}
case LLAvatarAppearanceDefines::BAKED_LOWER:
{
result = LLAvatarAppearanceDefines::TEX_LOWER_UNIVERSAL_TATTOO;
break;
}
case LLAvatarAppearanceDefines::BAKED_HEAD:
{
result = LLAvatarAppearanceDefines::TEX_HEAD_UNIVERSAL_TATTOO;
break;
}
default:
{

20
indra/newview/llpaneleditwearable.cpp
View File

@ -101,6 +101,7 @@ enum ESubpart {
SUBPART_SKIRT,
SUBPART_ALPHA,
SUBPART_TATTOO,
SUBPART_UNIVERSAL,
SUBPART_PHYSICS_BREASTS_UPDOWN,
SUBPART_PHYSICS_BREASTS_INOUT,
SUBPART_PHYSICS_BREASTS_LEFTRIGHT,
@ -244,8 +245,9 @@ LLEditWearableDictionary::Wearables::Wearables()
addEntry(LLWearableType::WT_UNDERPANTS, new WearableEntry(LLWearableType::WT_UNDERPANTS,"edit_underpants_title","underpants_desc_text", texture_vec_t{TEX_LOWER_UNDERPANTS}, texture_vec_t{TEX_LOWER_UNDERPANTS}, subpart_vec_t{SUBPART_UNDERPANTS}));
addEntry(LLWearableType::WT_SKIRT, new WearableEntry(LLWearableType::WT_SKIRT,"edit_skirt_title","skirt_desc_text", texture_vec_t{TEX_SKIRT}, texture_vec_t{TEX_SKIRT}, subpart_vec_t{SUBPART_SKIRT}));
addEntry(LLWearableType::WT_ALPHA, new WearableEntry(LLWearableType::WT_ALPHA,"edit_alpha_title","alpha_desc_text", texture_vec_t(), texture_vec_t{TEX_LOWER_ALPHA, TEX_UPPER_ALPHA, TEX_HEAD_ALPHA, TEX_EYES_ALPHA, TEX_HAIR_ALPHA}, subpart_vec_t{SUBPART_ALPHA}));
addEntry(LLWearableType::WT_TATTOO, new WearableEntry(LLWearableType::WT_TATTOO,"edit_tattoo_title","tattoo_desc_text", texture_vec_t{TEX_HEAD_TATTOO}, texture_vec_t{TEX_LOWER_TATTOO, TEX_UPPER_TATTOO, TEX_HEAD_TATTOO, TEX_SKIRT_TATTOO, TEX_HAIR_TATTOO, TEX_EYES_TATTOO, TEX_LEFT_ARM_TATTOO,TEX_LEFT_LEG_TATTOO,TEX_AUX1_TATTOO,TEX_AUX2_TATTOO,TEX_AUX3_TATTOO}, subpart_vec_t{SUBPART_TATTOO}));
addEntry(LLWearableType::WT_PHYSICS, new WearableEntry(LLWearableType::WT_PHYSICS,"edit_physics_title","physics_desc_text", texture_vec_t(), texture_vec_t(), subpart_vec_t{SUBPART_PHYSICS_BREASTS_UPDOWN, SUBPART_PHYSICS_BREASTS_INOUT, SUBPART_PHYSICS_BREASTS_LEFTRIGHT, SUBPART_PHYSICS_BELLY_UPDOWN, SUBPART_PHYSICS_BUTT_UPDOWN, SUBPART_PHYSICS_BUTT_LEFTRIGHT, SUBPART_PHYSICS_ADVANCED}));
addEntry(LLWearableType::WT_TATTOO, new WearableEntry(LLWearableType::WT_TATTOO,"edit_tattoo_title","tattoo_desc_text", texture_vec_t{TEX_HEAD_TATTOO}, texture_vec_t{TEX_LOWER_TATTOO, TEX_UPPER_TATTOO, TEX_HEAD_TATTOO}, subpart_vec_t{SUBPART_TATTOO}));
addEntry(LLWearableType::WT_UNIVERSAL, new WearableEntry(LLWearableType::WT_UNIVERSAL, "edit_universal_title", "universal_desc_text", texture_vec_t{ TEX_HEAD_UNIVERSAL_TATTOO }, texture_vec_t{ TEX_HEAD_UNIVERSAL_TATTOO, TEX_UPPER_UNIVERSAL_TATTOO, TEX_LOWER_UNIVERSAL_TATTOO, TEX_SKIRT_TATTOO, TEX_HAIR_TATTOO, TEX_EYES_TATTOO, TEX_LEFT_ARM_TATTOO, TEX_LEFT_LEG_TATTOO, TEX_AUX1_TATTOO, TEX_AUX2_TATTOO, TEX_AUX3_TATTOO }, subpart_vec_t{ SUBPART_UNIVERSAL }));
addEntry(LLWearableType::WT_PHYSICS, new WearableEntry(LLWearableType::WT_PHYSICS,"edit_physics_title","physics_desc_text", texture_vec_t(), texture_vec_t(), subpart_vec_t{SUBPART_PHYSICS_BREASTS_UPDOWN, SUBPART_PHYSICS_BREASTS_INOUT, SUBPART_PHYSICS_BREASTS_LEFTRIGHT, SUBPART_PHYSICS_BELLY_UPDOWN, SUBPART_PHYSICS_BUTT_UPDOWN, SUBPART_PHYSICS_BUTT_LEFTRIGHT, SUBPART_PHYSICS_ADVANCED}));
}
LLEditWearableDictionary::WearableEntry::WearableEntry(LLWearableType::EType type,
@ -296,13 +298,15 @@ LLEditWearableDictionary::Subparts::Subparts()
addEntry(SUBPART_GLOVES, new SubpartEntry(SUBPART_GLOVES, "mTorso", "gloves", "gloves_main_param_list", "gloves_main_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(-1.f, 0.15f, 0.f),SEX_BOTH));
addEntry(SUBPART_UNDERSHIRT, new SubpartEntry(SUBPART_UNDERSHIRT, "mTorso", "undershirt", "undershirt_main_param_list", "undershirt_main_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(-1.f, 0.15f, 0.3f),SEX_BOTH));
addEntry(SUBPART_UNDERPANTS, new SubpartEntry(SUBPART_UNDERPANTS, "mPelvis", "underpants", "underpants_main_param_list", "underpants_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
// <FS:Ansariel> Alpha and tattoo don't adhere to the usual panel layout and don't have a param list and main tab
// <FS:Ansariel> Alpha, tattoo and universal don't adhere to the usual panel layout and don't have a param list and main tab
//addEntry(SUBPART_ALPHA, new SubpartEntry(SUBPART_ALPHA, "mPelvis", "alpha", "alpha_main_param_list", "alpha_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
//addEntry(SUBPART_TATTOO, new SubpartEntry(SUBPART_TATTOO, "mPelvis", "tattoo", "tattoo_main_param_list", "tattoo_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
//addEntry(SUBPART_UNIVERSAL, new SubpartEntry(SUBPART_UNIVERSAL, "mPelvis", "universal", "universal_main_param_list", "universal_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f), SEX_BOTH));
addEntry(SUBPART_ALPHA, new SubpartEntry(SUBPART_ALPHA, "mPelvis", "alpha", "", "", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
addEntry(SUBPART_TATTOO, new SubpartEntry(SUBPART_TATTOO, "mPelvis", "tattoo", "", "", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
addEntry(SUBPART_UNIVERSAL, new SubpartEntry(SUBPART_UNIVERSAL, "mPelvis", "universal", "", "", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f), SEX_BOTH));
// </FS:Ansariel>
addEntry(SUBPART_PHYSICS_BREASTS_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BREASTS_UPDOWN, "mTorso", "physics_breasts_updown", "physics_breasts_updown_param_list", "physics_breasts_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
addEntry(SUBPART_PHYSICS_BREASTS_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BREASTS_UPDOWN, "mTorso", "physics_breasts_updown", "physics_breasts_updown_param_list", "physics_breasts_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
addEntry(SUBPART_PHYSICS_BREASTS_INOUT, new SubpartEntry(SUBPART_PHYSICS_BREASTS_INOUT, "mTorso", "physics_breasts_inout", "physics_breasts_inout_param_list", "physics_breasts_inout_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
addEntry(SUBPART_PHYSICS_BREASTS_LEFTRIGHT, new SubpartEntry(SUBPART_PHYSICS_BREASTS_LEFTRIGHT, "mTorso", "physics_breasts_leftright", "physics_breasts_leftright_param_list", "physics_breasts_leftright_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
// <FS:Ansariel> Fix XUI warning
@ -374,6 +378,9 @@ LLEditWearableDictionary::TextureCtrls::TextureCtrls()
addEntry ( TEX_LOWER_TATTOO, new PickerControlEntry (TEX_LOWER_TATTOO, "Lower Tattoo", LLUUID::null, TRUE ));
addEntry ( TEX_UPPER_TATTOO, new PickerControlEntry (TEX_UPPER_TATTOO, "Upper Tattoo", LLUUID::null, TRUE ));
addEntry ( TEX_HEAD_TATTOO, new PickerControlEntry (TEX_HEAD_TATTOO, "Head Tattoo", LLUUID::null, TRUE ));
addEntry ( TEX_LOWER_UNIVERSAL_TATTOO, new PickerControlEntry( TEX_LOWER_UNIVERSAL_TATTOO, "Lower Universal Tattoo", LLUUID::null, TRUE));
addEntry ( TEX_UPPER_UNIVERSAL_TATTOO, new PickerControlEntry( TEX_UPPER_UNIVERSAL_TATTOO, "Upper Universal Tattoo", LLUUID::null, TRUE));
addEntry ( TEX_HEAD_UNIVERSAL_TATTOO, new PickerControlEntry( TEX_HEAD_UNIVERSAL_TATTOO, "Head Universal Tattoo", LLUUID::null, TRUE));
addEntry ( TEX_SKIRT_TATTOO, new PickerControlEntry(TEX_SKIRT_TATTOO, "Skirt Tattoo", LLUUID::null, TRUE));
addEntry ( TEX_HAIR_TATTOO, new PickerControlEntry(TEX_HAIR_TATTOO, "Hair Tattoo", LLUUID::null, TRUE));
addEntry ( TEX_EYES_TATTOO, new PickerControlEntry(TEX_EYES_TATTOO, "Eyes Tattoo", LLUUID::null, TRUE));
@ -768,6 +775,7 @@ BOOL LLPanelEditWearable::postBuild()
mPanelSkirt = getChild<LLPanel>("edit_skirt_panel");
mPanelAlpha = getChild<LLPanel>("edit_alpha_panel");
mPanelTattoo = getChild<LLPanel>("edit_tattoo_panel");
mPanelUniversal = getChild<LLPanel>("edit_universal_panel");
mPanelPhysics = getChild<LLPanel>("edit_physics_panel");
mTxtAvatarHeight = mPanelShape->getChild<LLTextBox>("avatar_height");
@ -1582,6 +1590,10 @@ LLPanel* LLPanelEditWearable::getPanel(LLWearableType::EType type)
case LLWearableType::WT_TATTOO:
return mPanelTattoo;
break;
case LLWearableType::WT_UNIVERSAL:
return mPanelUniversal;
break;
case LLWearableType::WT_PHYSICS:
return mPanelPhysics;

1
indra/newview/llpaneleditwearable.h
View File

@ -176,6 +176,7 @@ private:
LLPanel *mPanelSkirt;
LLPanel *mPanelAlpha;
LLPanel *mPanelTattoo;
LLPanel *mPanelUniversal;
LLPanel *mPanelPhysics;
typedef std::map<std::string, LLAvatarAppearanceDefines::ETextureIndex> string_texture_index_map_t;

1
indra/newview/llpaneloutfitedit.cpp
View File

@ -473,6 +473,7 @@ BOOL LLPanelOutfitEdit::postBuild()
mListViewItemTypes.push_back(new LLFilterItem(LLTrans::getString("skirt"), new LLFindActualWearablesOfType(LLWearableType::WT_SKIRT)));
mListViewItemTypes.push_back(new LLFilterItem(LLTrans::getString("alpha"), new LLFindActualWearablesOfType(LLWearableType::WT_ALPHA)));
mListViewItemTypes.push_back(new LLFilterItem(LLTrans::getString("tattoo"), new LLFindActualWearablesOfType(LLWearableType::WT_TATTOO)));
mListViewItemTypes.push_back(new LLFilterItem(LLTrans::getString("universal"), new LLFindActualWearablesOfType(LLWearableType::WT_UNIVERSAL)));
mListViewItemTypes.push_back(new LLFilterItem(LLTrans::getString("physics"), new LLFindActualWearablesOfType(LLWearableType::WT_PHYSICS)));
mCurrentOutfitName = getChild<LLTextBox>("curr_outfit_name");

1
indra/newview/llpaneloutfitedit.h
View File

@ -97,6 +97,7 @@ public:
LVIT_SKIRT,
LVIT_ALPHA,
LVIT_TATTOO,
LVIT_UNIVERSAL,
LVIT_PHYSICS,
NUM_LIST_VIEW_ITEM_TYPES
} EListViewItemType;

1
indra/newview/llviewerinventory.cpp
View File

@ -141,6 +141,7 @@ LLLocalizedInventoryItemsDictionary::LLLocalizedInventoryItemsDictionary()
mInventoryItemsDict["New Skirt"] = LLTrans::getString("New Skirt");
mInventoryItemsDict["New Alpha"] = LLTrans::getString("New Alpha");
mInventoryItemsDict["New Tattoo"] = LLTrans::getString("New Tattoo");
mInventoryItemsDict["New Universal"] = LLTrans::getString("New Universal");
mInventoryItemsDict["New Physics"] = LLTrans::getString("New Physics");
mInventoryItemsDict["Invalid Wearable"] = LLTrans::getString("Invalid Wearable");

1
indra/newview/llwearableitemslist.cpp
View File

@ -530,6 +530,7 @@ clothing_to_string_map_t init_clothing_string_map()
w_map.insert(std::make_pair(LLWearableType::WT_SKIRT, "skirt_not_worn"));
w_map.insert(std::make_pair(LLWearableType::WT_ALPHA, "alpha_not_worn"));
w_map.insert(std::make_pair(LLWearableType::WT_TATTOO, "tattoo_not_worn"));
w_map.insert(std::make_pair(LLWearableType::WT_UNIVERSAL, "universal_not_worn"));
w_map.insert(std::make_pair(LLWearableType::WT_PHYSICS, "physics_not_worn"));
return w_map;
}

1
indra/newview/skins/ansastorm/textures/textures.xml
View File

@ -31,6 +31,7 @@
<texture name="Inv_Texture" file_name="legacy/inv_item_texture.tga" />
<texture name="Inv_Underpants" file_name="legacy/inv_item_underpants.tga" />
<texture name="Inv_Undershirt" file_name="legacy/inv_item_undershirt.tga" />
<texture name="Inv_Universal" file_name="legacy/inv_item_universal.tga" />
<texture name="Inv_TexturesOpen" file_name="legacy/inv_folder_texture.tga" />
<texture name="Inv_TexturesClosed" file_name="legacy/inv_folder_texture.tga" />

3
indra/newview/skins/ansastorm/xui/de/panel_main_inventory.xml
View File

@ -38,7 +38,8 @@
<menu_item_call name="inventory_new_undershirt" label="Neues Unterhemd"/>
<menu_item_call name="inventory_new_underpants" label="Neue Unterhose"/>
<menu_item_call name="inventory_new_tattoo" label="Neue Tätowierung"/>
<menu_item_call name="inventory_new_alpha" label="Neues Alpha"/>
<menu_item_call name="inventory_new_universal" label="Neues Universal"/>
<menu_item_call name="inventory_new_alpha" label="Neue Alpha-Maske"/>
<menu_item_call name="inventory_new_physics" label="Neue Physik"/>
</menu>
<menu name="inventory_new_body_parts" label="Neue Körperteile">

121
indra/newview/skins/ansastorm/xui/en/panel_edit_tattoo.xml
View File

@ -75,127 +75,6 @@
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Skirt Tattoo"
layout="topleft"
left_pad="30"
name="Skirt Tattoo"
tool_tip="Click to choose a picture"
top_delta="0"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Hair Tattoo"
layout="topleft"
left="20"
name="Hair Tattoo"
tool_tip="Click to choose a picture"
top_pad="10"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Eyes Tattoo"
layout="topleft"
left_pad="30"
name="Eyes Tattoo"
tool_tip="Click to choose a picture"
top_delta="0"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Left Arm Tattoo"
layout="topleft"
left="20"
name="Left Arm Tattoo"
tool_tip="Click to choose a picture"
top_pad="10"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Left Leg Tattoo"
layout="topleft"
left_pad="30"
name="Left Leg Tattoo"
tool_tip="Click to choose a picture"
top_delta="0"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Aux1 Tattoo"
layout="topleft"
left="20"
name="Aux1 Tattoo"
tool_tip="Click to choose a picture"
top_pad="10"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Aux2 Tattoo"
layout="topleft"
left_pad="30"
name="Aux2 Tattoo"
tool_tip="Click to choose a picture"
top_delta="0"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Aux3 Tattoo"
layout="topleft"
left="20"
name="Aux3 Tattoo"
tool_tip="Click to choose a picture"
top_pad="10"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<color_swatch
can_apply_immediately="true"
follows="left|top"

230
indra/newview/skins/ansastorm/xui/en/panel_edit_universal.xml Normal file
View File

@ -0,0 +1,230 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
layout="topleft"
left="0"
name="edit_universal_panel"
top_pad="10"
width="363" >
<scroll_container
follows="all"
height="400"
layout="topleft"
left="10"
name="avatar_universal_scroll"
reserve_scroll_corner="false"
top_pad="0"
width="344">
<panel
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="all"
height="725"
left="00"
layout="topleft"
name="avatar_universal_color_panel"
top="0"
width="328" >
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Head Tattoo"
layout="topleft"
left="20"
top_pad="10"
name="Head Universal Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Upper Tattoo"
layout="topleft"
left_pad="30"
top_delta="0"
name="Upper Universal Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Lower Tattoo"
layout="topleft"
left="20"
top_pad="10"
name="Lower Universal Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Skirt Tattoo"
layout="topleft"
left_pad="30"
top_delta="0"
name="Skirt Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Hair Tattoo"
layout="topleft"
left="20"
top_pad="10"
name="Hair Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Eyes Tattoo"
layout="topleft"
left_pad="30"
top_delta="0"
name="Eyes Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Left Arm Tattoo"
layout="topleft"
left="20"
top_pad="10"
name="Left Arm Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Left Leg Tattoo"
layout="topleft"
left_pad="30"
top_delta="0"
name="Left Leg Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Aux1 Tattoo"
layout="topleft"
left="20"
top_pad="10"
name="Aux1 Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Aux2 Tattoo"
layout="topleft"
left_pad="30"
top_delta="0"
name="Aux2 Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Aux3 Tattoo"
layout="topleft"
left="20"
top_pad="10"
name="Aux3 Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="115"
label="Color/Tint"
layout="topleft"
left_pad="30"
top_delta="0"
name="Color/Tint"
tool_tip="Click to open color picker"
width="115" >
<color_swatch.commit_callback
function="ColorSwatch.Commit" />
</color_swatch>
</panel>
</scroll_container>
</panel>

18
indra/newview/skins/ansastorm/xui/en/panel_edit_wearable.xml
View File

@ -71,6 +71,10 @@
name="edit_tattoo_title">
Editing Tattoo
</string>
<string
name="edit_universal_title">
Editing Universal
</string>
<string
name="edit_physics_title">
Editing Physics
@ -135,6 +139,10 @@
name="tattoo_desc_text">
Tattoo:
</string>
<string
name="universal_desc_text">
Universal:
</string>
<string
name="physics_desc_text">
Physics:
@ -418,6 +426,16 @@
top="8"
visible="false"
width="410" />
<panel
filename="panel_edit_universal.xml"
follows="all"
height="425"
layout="topleft"
left="0"
name="edit_universal_panel"
top="8"
visible="false"
width="410" />
<panel
filename="panel_edit_physics.xml"
follows="all"

7
indra/newview/skins/ansastorm/xui/en/panel_main_inventory.xml
View File

@ -220,6 +220,13 @@
function="Inventory.DoCreate"
parameter="tattoo" />
</menu_item_call>
<menu_item_call
name="inventory_new_universal"
label="New Universal">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="universal" />
</menu_item_call>
<menu_item_call
name="inventory_new_alpha"
label="New Alpha">

BIN
indra/newview/skins/default/textures/icons/Inv_Universal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 416 B

BIN
indra/newview/skins/default/textures/legacy/inv_item_universal.tga Normal file
View File

Binary file not shown.

1
indra/newview/skins/default/textures/textures.xml
View File

@ -333,6 +333,7 @@ with the same filename but different name
<texture name="Inv_SysClosed" file_name="icons/Inv_SysClosed.png" preload="false" />
<texture name="Inv_SysOpen" file_name="icons/Inv_SysOpen.png" preload="false" />
<texture name="Inv_Tattoo" file_name="icons/Inv_Tattoo.png" preload="false" />
<texture name="Inv_Universal" file_name="icons/Inv_Universal.png" preload="false" />
<texture name="Inv_Physics" file_name="icons/Inv_Physics.png" preload="false" />
<texture name="Inv_Texture" file_name="icons/Inv_Texture.png" preload="false" />
<texture name="Inv_TrashClosed" file_name="icons/Inv_TrashClosed.png" preload="false" />

1
indra/newview/skins/default/xui/de/menu_inventory.xml
View File

@ -34,6 +34,7 @@
<menu_item_call label="Neue Unterhose" name="New Underpants"/>
<menu_item_call label="Neue Alpha-Maske" name="New Alpha Mask"/>
<menu_item_call label="Neue Tätowierung" name="New Tattoo"/>
<menu_item_call label="Neues Universal" name="New Universal"/>
<menu_item_call label="Neue Physik" name="New Physics"/>
</menu>
<menu label="Neue Körperteile" name="New Body Parts">

3
indra/newview/skins/default/xui/de/menu_inventory_add.xml
View File

@ -23,8 +23,9 @@
<menu_item_call label="Neue Handschuhe" name="New Gloves"/>
<menu_item_call label="Neues Unterhemd" name="New Undershirt"/>
<menu_item_call label="Neue Unterhose" name="New Underpants"/>
<menu_item_call label="Neues Alpha" name="New Alpha"/>
<menu_item_call label="Neue Alpha-Maske" name="New Alpha"/>
<menu_item_call label="Neue Tätowierung" name="New Tattoo"/>
<menu_item_call label="Neues Universal" name="New Universal"/>
<menu_item_call label="Neue Physik" name="New Physics"/>
</menu>
<menu label="Neue Körperteile" name="New Body Parts">

3
indra/newview/skins/default/xui/de/menu_outfit_gear.xml
View File

@ -17,9 +17,10 @@
<menu_item_call label="Neue Handschuhe" name="New Gloves"/>
<menu_item_call label="Neues Unterhemd" name="New Undershirt"/>
<menu_item_call label="Neue Unterhose" name="New Underpants"/>
<menu_item_call label="Neues Alpha" name="New Alpha"/>
<menu_item_call label="Neue Alpha-Maske" name="New Alpha"/>
<menu_item_call label="Neue Physik" name="New Physics"/>
<menu_item_call label="Neue Tätowierung" name="New Tattoo"/>
<menu_item_call label="Neues Universal" name="New Universal"/>
</context_menu>
<context_menu label="Neue Körperteile" name="New Body Parts">
<menu_item_call label="Neue Form" name="New Shape"/>

19
indra/newview/skins/default/xui/de/panel_edit_universal.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="edit_universal_panel">
<scroll_container name="avatar_universal_scroll">
<panel name="avatar_universal_color_panel">
<texture_picker label="Kopftattoo" name="Head Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
<texture_picker label="Obere Tattoos" name="Upper Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
<texture_picker label="Untere Tattoos" name="Lower Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
<texture_picker label="Rock-Tattoo" name="Skirt Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
<texture_picker label="Haar-Tattoo" name="Hair Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
<texture_picker label="Augen-Tattoo" name="Eyes Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
<texture_picker label="Linker Arm-Tattoo" name="Left Arm Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
<texture_picker label="Linkes Bein-Tattoo" name="Left Leg Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
<texture_picker label="Aux1-Tattoo" name="Aux1 Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
<texture_picker label="Aux2-Tattoo" name="Aux2 Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
<texture_picker label="Aux3-Tattoo" name="Aux3 Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
<color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
</panel>
</scroll_container>
</panel>

6
indra/newview/skins/default/xui/de/panel_edit_wearable.xml
View File

@ -45,6 +45,9 @@
<string name="edit_tattoo_title">
Tätowierung bearbeiten
</string>
<string name="edit_universal_title">
Universal bearbeiten
</string>
<string name="edit_physics_title">
Physik bearbeiten
</string>
@ -93,6 +96,9 @@
<string name="tattoo_desc_text">
Tätowierung:
</string>
<string name="universal_desc_text">
Universal:
</string>
<string name="physics_desc_text">
Physik:
</string>

12
indra/newview/skins/default/xui/de/strings.xml
View File

@ -1457,6 +1457,9 @@ http://www.firestormviewer.org/support für Hilfe zum Lösen des Problems.
<string name="tattoo">
Tätowierung
</string>
<string name="universal">
Universal
</string>
<string name="physics">
Physik
</string>
@ -1499,6 +1502,9 @@ http://www.firestormviewer.org/support für Hilfe zum Lösen des Problems.
<string name="tattoo_not_worn">
Tätowierung nicht getragen
</string>
<string name="universal_not_worn">
Universal nicht getragen
</string>
<string name="physics_not_worn">
Physik nicht getragen
</string>
@ -1550,6 +1556,9 @@ http://www.firestormviewer.org/support für Hilfe zum Lösen des Problems.
<string name="create_new_tattoo">
Neue Tätowierung erstellen
</string>
<string name="create_new_universal">
Neues Universal erstellen
</string>
<string name="create_new_physics">
Neue Physik erstellen
</string>
@ -4974,6 +4983,9 @@ Missbrauchsbericht
<string name="New Tattoo">
Neue Tätowierung
</string>
<string name="New Universal">
Neues Universal
</string>
<string name="New Physics">
Neue Physik
</string>

8
indra/newview/skins/default/xui/en/menu_inventory.xml
View File

@ -275,6 +275,14 @@
function="Inventory.DoCreate"
parameter="tattoo" />
</menu_item_call>
<menu_item_call
label="New Universal"
layout="topleft"
name="New Universal">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="universal" />
</menu_item_call>
<menu_item_call
label="New Physics"
layout="topleft"

8
indra/newview/skins/default/xui/en/menu_inventory_add.xml
View File

@ -202,6 +202,14 @@
function="Inventory.DoCreate"
parameter="tattoo" />
</menu_item_call>
<menu_item_call
label="New Universal"
layout="topleft"
name="New Universal">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="universal" />
</menu_item_call>
<menu_item_call
label="New Physics"
layout="topleft"

8
indra/newview/skins/default/xui/en/menu_outfit_gear.xml
View File

@ -175,6 +175,14 @@
function="Gear.Create"
parameter="tattoo" />
</menu_item_call>
<menu_item_call
label="New Universal"
layout="topleft"
name="New Universal">
<menu_item_call.on_click
function="Gear.Create"
parameter="universal" />
</menu_item_call>
</context_menu>
<context_menu
height="85"

121
indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
View File

@ -75,126 +75,7 @@
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Skirt Tattoo"
layout="topleft"
left_pad="30"
name="Skirt Tattoo"
tool_tip="Click to choose a picture"
top_delta="0"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Hair Tattoo"
layout="topleft"
left="20"
name="Hair Tattoo"
tool_tip="Click to choose a picture"
top_pad="10"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Eyes Tattoo"
layout="topleft"
left_pad="30"
name="Eyes Tattoo"
tool_tip="Click to choose a picture"
top_delta="0"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Left Arm Tattoo"
layout="topleft"
left="20"
name="Left Arm Tattoo"
tool_tip="Click to choose a picture"
top_pad="10"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Left Leg Tattoo"
layout="topleft"
left_pad="30"
name="Left Leg Tattoo"
tool_tip="Click to choose a picture"
top_delta="0"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Aux1 Tattoo"
layout="topleft"
left="20"
name="Aux1 Tattoo"
tool_tip="Click to choose a picture"
top_pad="10"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Aux2 Tattoo"
layout="topleft"
left_pad="30"
name="Aux2 Tattoo"
tool_tip="Click to choose a picture"
top_delta="0"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Aux3 Tattoo"
layout="topleft"
left="20"
name="Aux3 Tattoo"
tool_tip="Click to choose a picture"
top_pad="10"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<color_swatch
can_apply_immediately="true"

230
indra/newview/skins/default/xui/en/panel_edit_universal.xml Normal file
View File

@ -0,0 +1,230 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
layout="topleft"
left="0"
name="edit_universal_panel"
top_pad="10"
width="333" >
<scroll_container
follows="all"
height="400"
layout="topleft"
left="10"
name="avatar_universal_scroll"
reserve_scroll_corner="false"
top_pad="0"
width="314">
<panel
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="all"
height="725"
left="0"
layout="topleft"
name="avatar_universal_color_panel"
top="0"
width="298" >
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Head Tattoo"
layout="topleft"
left="20"
top_pad="10"
name="Head Universal Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Upper Tattoo"
layout="topleft"
left_pad="30"
top_delta="0"
name="Upper Universal Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Lower Tattoo"
layout="topleft"
left="20"
top_pad="10"
name="Lower Universal Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Skirt Tattoo"
layout="topleft"
left_pad="30"
top_delta="0"
name="Skirt Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Hair Tattoo"
layout="topleft"
left="20"
top_pad="10"
name="Hair Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Eyes Tattoo"
layout="topleft"
left_pad="30"
top_delta="0"
name="Eyes Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Left Arm Tattoo"
layout="topleft"
left="20"
top_pad="10"
name="Left Arm Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Left Leg Tattoo"
layout="topleft"
left_pad="30"
top_delta="0"
name="Left Leg Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Aux1 Tattoo"
layout="topleft"
left="20"
top_pad="10"
name="Aux1 Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Aux2 Tattoo"
layout="topleft"
left_pad="30"
top_delta="0"
name="Aux2 Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="115"
label="Aux3 Tattoo"
layout="topleft"
left="20"
top_pad="10"
name="Aux3 Tattoo"
tool_tip="Click to choose a picture"
width="115" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="115"
label="Color/Tint"
layout="topleft"
left_pad="30"
top_delta="0"
name="Color/Tint"
tool_tip="Click to open color picker"
width="115" >
<color_swatch.commit_callback
function="ColorSwatch.Commit" />
</color_swatch>
</panel>
</scroll_container>
</panel>

18
indra/newview/skins/default/xui/en/panel_edit_wearable.xml
View File

@ -71,6 +71,10 @@
name="edit_tattoo_title">
Editing Tattoo
</string>
<string
name="edit_universal_title">
Editing Universal
</string>
<string
name="edit_physics_title">
Editing Physics
@ -135,6 +139,10 @@
name="tattoo_desc_text">
Tattoo:
</string>
<string
name="universal_desc_text">
Universal:
</string>
<string
name="physics_desc_text">
Physics:
@ -418,6 +426,16 @@
top="8"
visible="false"
width="333" />
<panel
filename="panel_edit_universal.xml"
follows="all"
height="425"
layout="topleft"
left="0"
name="edit_universal_panel"
top="8"
visible="false"
width="333" />
<panel
filename="panel_edit_physics.xml"
follows="all"

4
indra/newview/skins/default/xui/en/strings.xml
View File

@ -652,6 +652,7 @@ http://www.firestormviewer.org/support for help fixing this problem.
<string name="skirt">Skirt</string>
<string name="alpha">Alpha</string>
<string name="tattoo">Tattoo</string>
<string name="universal">Universal</string>
<string name="physics">Physics</string>
<string name="invalid">invalid</string>
<string name="none">none</string>
@ -668,6 +669,7 @@ http://www.firestormviewer.org/support for help fixing this problem.
<string name="skirt_not_worn">Skirt not worn</string>
<string name="alpha_not_worn">Alpha not worn</string>
<string name="tattoo_not_worn">Tattoo not worn</string>
<string name="universal_not_worn">Universal not worn</string>
<string name="physics_not_worn">Physics not worn</string>
<string name="invalid_not_worn">invalid</string>
@ -687,6 +689,7 @@ http://www.firestormviewer.org/support for help fixing this problem.
<string name="create_new_skirt">Create new skirt</string>
<string name="create_new_alpha">Create new alpha</string>
<string name="create_new_tattoo">Create new tattoo</string>
<string name="create_new_universal">Create new universal</string>
<string name="create_new_physics">Create new physics</string>
<string name="create_new_invalid">invalid</string>
@ -2294,6 +2297,7 @@ Abuse Report</string>
<string name="New Skirt">New Skirt</string>
<string name="New Alpha">New Alpha</string>
<string name="New Tattoo">New Tattoo</string>
<string name="New Universal">New Universal</string>
<string name="New Physics">New Physics</string>
<string name="Invalid Wearable">Invalid Wearable</string>
<string name="New Gesture">New Gesture</string>

1
indra/newview/skins/firestorm/textures/textures.xml
View File

@ -31,6 +31,7 @@
<texture name="Inv_Texture" file_name="legacy/inv_item_texture.tga" />
<texture name="Inv_Underpants" file_name="legacy/inv_item_underpants.tga" />
<texture name="Inv_Undershirt" file_name="legacy/inv_item_undershirt.tga" />
<texture name="Inv_Universal" file_name="legacy/inv_item_universal.tga" />
<texture name="Inv_TexturesOpen" file_name="legacy/inv_folder_texture.tga" />
<texture name="Inv_TexturesClosed" file_name="legacy/inv_folder_texture.tga" />

1
indra/newview/skins/latency/textures/textures.xml
View File

@ -317,6 +317,7 @@
<texture name="Inv_Texture" file_name="legacy/inv_item_texture.tga" />
<texture name="Inv_Underpants" file_name="legacy/inv_item_underpants.tga" />
<texture name="Inv_Undershirt" file_name="legacy/inv_item_undershirt.tga" />
<texture name="Inv_Universal" file_name="legacy/inv_item_universal.tga" />
<texture name="Inv_TexturesOpen" file_name="legacy/inv_folder_texture.tga" />
<texture name="Inv_TexturesClosed" file_name="legacy/inv_folder_texture.tga" />

BIN
indra/newview/skins/starlight/textures/icons/Inv_Universal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 416 B

1
indra/newview/skins/starlight/textures/textures.xml
View File

@ -328,6 +328,7 @@ with the same filename but different name
<texture name="Inv_TrashOpen" file_name="icons/Inv_TrashOpen.png" preload="false" />
<texture name="Inv_Underpants" file_name="icons/Inv_Underpants.png" preload="false" />
<texture name="Inv_Undershirt" file_name="icons/Inv_Undershirt.png" preload="false" />
<texture name="Inv_Universal" file_name="icons/Inv_Universal.png" preload="false" />
<texture name="Inv_Link" file_name="icons/Inv_Link.png" preload="false" />
<texture name="Inv_Invalid" file_name="icons/Inv_Invalid.png" preload="false" />

BIN
indra/newview/skins/starlightcui/textures/icons/Inv_Universal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 416 B

1
indra/newview/skins/starlightcui/textures/textures.xml
View File

@ -328,6 +328,7 @@ with the same filename but different name
<texture name="Inv_TrashOpen" file_name="icons/Inv_TrashOpen.png" preload="false" />
<texture name="Inv_Underpants" file_name="icons/Inv_Underpants.png" preload="false" />
<texture name="Inv_Undershirt" file_name="icons/Inv_Undershirt.png" preload="false" />
<texture name="Inv_Universal" file_name="icons/Inv_Universal.png" preload="false" />
<texture name="Inv_Link" file_name="icons/Inv_Link.png" preload="false" />
<texture name="Inv_Invalid" file_name="icons/Inv_Invalid.png" preload="false" />

20
indra/newview/skins/starlightcui/xui/en/panel_edit_wearable.xml
View File

@ -71,6 +71,10 @@
name="edit_tattoo_title">
Editing Tattoo
</string>
<string
name="edit_universal_title">
Editing Universal
</string>
<string
name="edit_physics_title">
Editing Physics
@ -135,6 +139,10 @@
name="tattoo_desc_text">
Tattoo:
</string>
<string
name="universal_desc_text">
Universal:
</string>
<string
name="physics_desc_text">
Physics:
@ -418,7 +426,17 @@
top="8"
visible="false"
width="333" />
<panel
<panel
filename="panel_edit_universal.xml"
follows="all"
height="425"
layout="topleft"
left="0"
name="edit_universal_panel"
top="8"
visible="false"
width="333" />
<panel
filename="panel_edit_physics.xml"
follows="all"
height="425"

1
indra/newview/skins/vintage/textures/textures.xml
View File

@ -317,6 +317,7 @@
<texture name="Inv_Texture" file_name="legacy/inv_item_texture.tga" />
<texture name="Inv_Underpants" file_name="legacy/inv_item_underpants.tga" />
<texture name="Inv_Undershirt" file_name="legacy/inv_item_undershirt.tga" />
<texture name="Inv_Universal" file_name="legacy/inv_item_universal.tga" />
<texture name="Inv_TexturesOpen" file_name="legacy/inv_folder_texture.tga" />
<texture name="Inv_TexturesClosed" file_name="legacy/inv_folder_texture.tga" />

3
indra/newview/skins/vintage/xui/de/panel_main_inventory.xml
View File

@ -70,7 +70,8 @@
</menu_item_call>
<menu_item_call name="inventory_new_tattoo" label="Neue Tätowierung">
</menu_item_call>
<menu_item_call name="inventory_new_alpha" label="Neues Alpha">
<menu_item_call name="inventory_new_universal" label="Neues Universal"/>
<menu_item_call name="inventory_new_alpha" label="Neue Alpha-Maske">
</menu_item_call>
<menu_item_call name="inventory_new_physics" label="Neue Physik">
</menu_item_call>

7
indra/newview/skins/vintage/xui/en/panel_main_inventory.xml
View File

@ -227,6 +227,13 @@
function="Inventory.DoCreate"
parameter="alpha" />
</menu_item_call>
<menu_item_call
name="inventory_new_universal"
label="New Universal">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="universal" />
</menu_item_call>
<menu_item_call
name="inventory_new_physics"
label="New Physics">