From 225ac5c487548ba7e62f3e15f1b941baba3a433c Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 3 Aug 2012 17:49:03 -0400 Subject: Added viewer param for appearance message version --- indra/newview/character/avatar_lad.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) mode change 100644 => 100755 indra/newview/character/avatar_lad.xml (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml old mode 100644 new mode 100755 index 99dbfcae51..2b090c4fa4 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -12291,6 +12291,17 @@ render_pass="bump"> + + + + -- cgit v1.2.3 From d1c144519306cae7eff7f781417482c85068988c Mon Sep 17 00:00:00 2001 From: Nyx Linden Date: Thu, 28 Feb 2013 17:25:37 -0500 Subject: SH-3909 Support avatar height offset Adding a new visual param that allows users to manually adjust an offset for how far off the ground (+ or -) their avatar's root bone is. Supports the +-2m range people are used to adjusting in their viewers, but new implementation should support server-generated appearances. --- indra/newview/character/avatar_lad.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 2b090c4fa4..284e9c44b2 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -1084,6 +1084,23 @@ scale="0 0 .5" /> + + + + + Date: Fri, 29 Mar 2013 07:50:08 -0700 Subject: Update Mac and Windows breakpad builds to latest --- indra/newview/character/attentions.xml | 0 indra/newview/character/attentionsN.xml | 0 indra/newview/character/avatar_eye.llm | Bin indra/newview/character/avatar_eye_1.llm | Bin indra/newview/character/avatar_eyelashes.llm | Bin indra/newview/character/avatar_hair.llm | Bin indra/newview/character/avatar_hair_1.llm | Bin indra/newview/character/avatar_hair_2.llm | Bin indra/newview/character/avatar_hair_3.llm | Bin indra/newview/character/avatar_hair_4.llm | Bin indra/newview/character/avatar_hair_5.llm | Bin indra/newview/character/avatar_head.llm | Bin indra/newview/character/avatar_head_1.llm | Bin indra/newview/character/avatar_head_2.llm | Bin indra/newview/character/avatar_head_3.llm | Bin indra/newview/character/avatar_head_4.llm | Bin indra/newview/character/avatar_lad.xml | 0 indra/newview/character/avatar_lower_body.llm | Bin indra/newview/character/avatar_lower_body_1.llm | Bin indra/newview/character/avatar_lower_body_2.llm | Bin indra/newview/character/avatar_lower_body_3.llm | Bin indra/newview/character/avatar_lower_body_4.llm | Bin indra/newview/character/avatar_skeleton.xml | 0 indra/newview/character/avatar_skirt.llm | Bin indra/newview/character/avatar_skirt_1.llm | Bin indra/newview/character/avatar_skirt_2.llm | Bin indra/newview/character/avatar_skirt_3.llm | Bin indra/newview/character/avatar_skirt_4.llm | Bin indra/newview/character/avatar_upper_body.llm | Bin indra/newview/character/avatar_upper_body_1.llm | Bin indra/newview/character/avatar_upper_body_2.llm | Bin indra/newview/character/avatar_upper_body_3.llm | Bin indra/newview/character/avatar_upper_body_4.llm | Bin indra/newview/character/blush_alpha.tga | Bin indra/newview/character/body_skingrain.tga | Bin indra/newview/character/bodyfreckles_alpha.tga | Bin indra/newview/character/bump_face_wrinkles.tga | Bin indra/newview/character/bump_head_base.tga | Bin indra/newview/character/bump_lowerbody_base.tga | Bin indra/newview/character/bump_pants_wrinkles.tga | Bin indra/newview/character/bump_shirt_wrinkles.tga | Bin indra/newview/character/bump_upperbody_base.tga | Bin indra/newview/character/checkerboard.tga | Bin indra/newview/character/eyebrows_alpha.tga | Bin indra/newview/character/eyeliner_alpha.tga | Bin indra/newview/character/eyeshadow_inner_alpha.tga | Bin indra/newview/character/eyeshadow_outer_alpha.tga | Bin indra/newview/character/eyewhite.tga | Bin indra/newview/character/facehair_chincurtains_alpha.tga | Bin indra/newview/character/facehair_moustache_alpha.tga | Bin indra/newview/character/facehair_sideburns_alpha.tga | Bin indra/newview/character/facehair_soulpatch_alpha.tga | Bin indra/newview/character/freckles_alpha.tga | Bin indra/newview/character/genepool.xml | 0 indra/newview/character/glove_length_alpha.tga | Bin indra/newview/character/gloves_fingers_alpha.tga | Bin indra/newview/character/head_alpha.tga | Bin indra/newview/character/head_color.tga | Bin indra/newview/character/head_hair.tga | Bin indra/newview/character/head_highlights_alpha.tga | Bin indra/newview/character/head_shading_alpha.tga | Bin indra/newview/character/head_skingrain.tga | Bin indra/newview/character/jacket_length_lower_alpha.tga | Bin indra/newview/character/jacket_length_upper_alpha.tga | Bin indra/newview/character/jacket_open_lower_alpha.tga | Bin indra/newview/character/jacket_open_upper_alpha.tga | Bin indra/newview/character/lipgloss_alpha.tga | Bin indra/newview/character/lips_mask.tga | Bin indra/newview/character/lipstick_alpha.tga | Bin indra/newview/character/lowerbody_color.tga | Bin indra/newview/character/lowerbody_highlights_alpha.tga | Bin indra/newview/character/lowerbody_shading_alpha.tga | Bin indra/newview/character/nailpolish_alpha.tga | Bin indra/newview/character/pants_length_alpha.tga | Bin indra/newview/character/pants_waist_alpha.tga | Bin indra/newview/character/rosyface_alpha.tga | Bin indra/newview/character/rouge_alpha.tga | Bin indra/newview/character/shirt_bottom_alpha.tga | Bin indra/newview/character/shirt_collar_alpha.tga | Bin indra/newview/character/shirt_collar_back_alpha.tga | Bin indra/newview/character/shirt_sleeve_alpha.tga | Bin indra/newview/character/shoe_height_alpha.tga | Bin indra/newview/character/skirt_length_alpha.tga | Bin indra/newview/character/skirt_slit_back_alpha.tga | Bin indra/newview/character/skirt_slit_front_alpha.tga | Bin indra/newview/character/skirt_slit_left_alpha.tga | Bin indra/newview/character/skirt_slit_right_alpha.tga | Bin indra/newview/character/underpants_trial_female.tga | Bin indra/newview/character/underpants_trial_male.tga | Bin indra/newview/character/undershirt_trial_female.tga | Bin indra/newview/character/upperbody_color.tga | Bin indra/newview/character/upperbody_highlights_alpha.tga | Bin indra/newview/character/upperbody_shading_alpha.tga | Bin indra/newview/character/upperbodyfreckles_alpha.tga | Bin 94 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 indra/newview/character/attentions.xml mode change 100644 => 100755 indra/newview/character/attentionsN.xml mode change 100644 => 100755 indra/newview/character/avatar_eye.llm mode change 100644 => 100755 indra/newview/character/avatar_eye_1.llm mode change 100644 => 100755 indra/newview/character/avatar_eyelashes.llm mode change 100644 => 100755 indra/newview/character/avatar_hair.llm mode change 100644 => 100755 indra/newview/character/avatar_hair_1.llm mode change 100644 => 100755 indra/newview/character/avatar_hair_2.llm mode change 100644 => 100755 indra/newview/character/avatar_hair_3.llm mode change 100644 => 100755 indra/newview/character/avatar_hair_4.llm mode change 100644 => 100755 indra/newview/character/avatar_hair_5.llm mode change 100644 => 100755 indra/newview/character/avatar_head.llm mode change 100644 => 100755 indra/newview/character/avatar_head_1.llm mode change 100644 => 100755 indra/newview/character/avatar_head_2.llm mode change 100644 => 100755 indra/newview/character/avatar_head_3.llm mode change 100644 => 100755 indra/newview/character/avatar_head_4.llm mode change 100644 => 100755 indra/newview/character/avatar_lad.xml mode change 100644 => 100755 indra/newview/character/avatar_lower_body.llm mode change 100644 => 100755 indra/newview/character/avatar_lower_body_1.llm mode change 100644 => 100755 indra/newview/character/avatar_lower_body_2.llm mode change 100644 => 100755 indra/newview/character/avatar_lower_body_3.llm mode change 100644 => 100755 indra/newview/character/avatar_lower_body_4.llm mode change 100644 => 100755 indra/newview/character/avatar_skeleton.xml mode change 100644 => 100755 indra/newview/character/avatar_skirt.llm mode change 100644 => 100755 indra/newview/character/avatar_skirt_1.llm mode change 100644 => 100755 indra/newview/character/avatar_skirt_2.llm mode change 100644 => 100755 indra/newview/character/avatar_skirt_3.llm mode change 100644 => 100755 indra/newview/character/avatar_skirt_4.llm mode change 100644 => 100755 indra/newview/character/avatar_upper_body.llm mode change 100644 => 100755 indra/newview/character/avatar_upper_body_1.llm mode change 100644 => 100755 indra/newview/character/avatar_upper_body_2.llm mode change 100644 => 100755 indra/newview/character/avatar_upper_body_3.llm mode change 100644 => 100755 indra/newview/character/avatar_upper_body_4.llm mode change 100644 => 100755 indra/newview/character/blush_alpha.tga mode change 100644 => 100755 indra/newview/character/body_skingrain.tga mode change 100644 => 100755 indra/newview/character/bodyfreckles_alpha.tga mode change 100644 => 100755 indra/newview/character/bump_face_wrinkles.tga mode change 100644 => 100755 indra/newview/character/bump_head_base.tga mode change 100644 => 100755 indra/newview/character/bump_lowerbody_base.tga mode change 100644 => 100755 indra/newview/character/bump_pants_wrinkles.tga mode change 100644 => 100755 indra/newview/character/bump_shirt_wrinkles.tga mode change 100644 => 100755 indra/newview/character/bump_upperbody_base.tga mode change 100644 => 100755 indra/newview/character/checkerboard.tga mode change 100644 => 100755 indra/newview/character/eyebrows_alpha.tga mode change 100644 => 100755 indra/newview/character/eyeliner_alpha.tga mode change 100644 => 100755 indra/newview/character/eyeshadow_inner_alpha.tga mode change 100644 => 100755 indra/newview/character/eyeshadow_outer_alpha.tga mode change 100644 => 100755 indra/newview/character/eyewhite.tga mode change 100644 => 100755 indra/newview/character/facehair_chincurtains_alpha.tga mode change 100644 => 100755 indra/newview/character/facehair_moustache_alpha.tga mode change 100644 => 100755 indra/newview/character/facehair_sideburns_alpha.tga mode change 100644 => 100755 indra/newview/character/facehair_soulpatch_alpha.tga mode change 100644 => 100755 indra/newview/character/freckles_alpha.tga mode change 100644 => 100755 indra/newview/character/genepool.xml mode change 100644 => 100755 indra/newview/character/glove_length_alpha.tga mode change 100644 => 100755 indra/newview/character/gloves_fingers_alpha.tga mode change 100644 => 100755 indra/newview/character/head_alpha.tga mode change 100644 => 100755 indra/newview/character/head_color.tga mode change 100644 => 100755 indra/newview/character/head_hair.tga mode change 100644 => 100755 indra/newview/character/head_highlights_alpha.tga mode change 100644 => 100755 indra/newview/character/head_shading_alpha.tga mode change 100644 => 100755 indra/newview/character/head_skingrain.tga mode change 100644 => 100755 indra/newview/character/jacket_length_lower_alpha.tga mode change 100644 => 100755 indra/newview/character/jacket_length_upper_alpha.tga mode change 100644 => 100755 indra/newview/character/jacket_open_lower_alpha.tga mode change 100644 => 100755 indra/newview/character/jacket_open_upper_alpha.tga mode change 100644 => 100755 indra/newview/character/lipgloss_alpha.tga mode change 100644 => 100755 indra/newview/character/lips_mask.tga mode change 100644 => 100755 indra/newview/character/lipstick_alpha.tga mode change 100644 => 100755 indra/newview/character/lowerbody_color.tga mode change 100644 => 100755 indra/newview/character/lowerbody_highlights_alpha.tga mode change 100644 => 100755 indra/newview/character/lowerbody_shading_alpha.tga mode change 100644 => 100755 indra/newview/character/nailpolish_alpha.tga mode change 100644 => 100755 indra/newview/character/pants_length_alpha.tga mode change 100644 => 100755 indra/newview/character/pants_waist_alpha.tga mode change 100644 => 100755 indra/newview/character/rosyface_alpha.tga mode change 100644 => 100755 indra/newview/character/rouge_alpha.tga mode change 100644 => 100755 indra/newview/character/shirt_bottom_alpha.tga mode change 100644 => 100755 indra/newview/character/shirt_collar_alpha.tga mode change 100644 => 100755 indra/newview/character/shirt_collar_back_alpha.tga mode change 100644 => 100755 indra/newview/character/shirt_sleeve_alpha.tga mode change 100644 => 100755 indra/newview/character/shoe_height_alpha.tga mode change 100644 => 100755 indra/newview/character/skirt_length_alpha.tga mode change 100644 => 100755 indra/newview/character/skirt_slit_back_alpha.tga mode change 100644 => 100755 indra/newview/character/skirt_slit_front_alpha.tga mode change 100644 => 100755 indra/newview/character/skirt_slit_left_alpha.tga mode change 100644 => 100755 indra/newview/character/skirt_slit_right_alpha.tga mode change 100644 => 100755 indra/newview/character/underpants_trial_female.tga mode change 100644 => 100755 indra/newview/character/underpants_trial_male.tga mode change 100644 => 100755 indra/newview/character/undershirt_trial_female.tga mode change 100644 => 100755 indra/newview/character/upperbody_color.tga mode change 100644 => 100755 indra/newview/character/upperbody_highlights_alpha.tga mode change 100644 => 100755 indra/newview/character/upperbody_shading_alpha.tga mode change 100644 => 100755 indra/newview/character/upperbodyfreckles_alpha.tga (limited to 'indra/newview/character') diff --git a/indra/newview/character/attentions.xml b/indra/newview/character/attentions.xml old mode 100644 new mode 100755 diff --git a/indra/newview/character/attentionsN.xml b/indra/newview/character/attentionsN.xml old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_eye.llm b/indra/newview/character/avatar_eye.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_eye_1.llm b/indra/newview/character/avatar_eye_1.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_eyelashes.llm b/indra/newview/character/avatar_eyelashes.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_hair.llm b/indra/newview/character/avatar_hair.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_hair_1.llm b/indra/newview/character/avatar_hair_1.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_hair_2.llm b/indra/newview/character/avatar_hair_2.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_hair_3.llm b/indra/newview/character/avatar_hair_3.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_hair_4.llm b/indra/newview/character/avatar_hair_4.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_hair_5.llm b/indra/newview/character/avatar_hair_5.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_head.llm b/indra/newview/character/avatar_head.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_head_1.llm b/indra/newview/character/avatar_head_1.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_head_2.llm b/indra/newview/character/avatar_head_2.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_head_3.llm b/indra/newview/character/avatar_head_3.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_head_4.llm b/indra/newview/character/avatar_head_4.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_lower_body.llm b/indra/newview/character/avatar_lower_body.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_lower_body_1.llm b/indra/newview/character/avatar_lower_body_1.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_lower_body_2.llm b/indra/newview/character/avatar_lower_body_2.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_lower_body_3.llm b/indra/newview/character/avatar_lower_body_3.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_lower_body_4.llm b/indra/newview/character/avatar_lower_body_4.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_skirt.llm b/indra/newview/character/avatar_skirt.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_skirt_1.llm b/indra/newview/character/avatar_skirt_1.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_skirt_2.llm b/indra/newview/character/avatar_skirt_2.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_skirt_3.llm b/indra/newview/character/avatar_skirt_3.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_skirt_4.llm b/indra/newview/character/avatar_skirt_4.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_upper_body.llm b/indra/newview/character/avatar_upper_body.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_upper_body_1.llm b/indra/newview/character/avatar_upper_body_1.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_upper_body_2.llm b/indra/newview/character/avatar_upper_body_2.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_upper_body_3.llm b/indra/newview/character/avatar_upper_body_3.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/avatar_upper_body_4.llm b/indra/newview/character/avatar_upper_body_4.llm old mode 100644 new mode 100755 diff --git a/indra/newview/character/blush_alpha.tga b/indra/newview/character/blush_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/body_skingrain.tga b/indra/newview/character/body_skingrain.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/bodyfreckles_alpha.tga b/indra/newview/character/bodyfreckles_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/bump_face_wrinkles.tga b/indra/newview/character/bump_face_wrinkles.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/bump_head_base.tga b/indra/newview/character/bump_head_base.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/bump_lowerbody_base.tga b/indra/newview/character/bump_lowerbody_base.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/bump_pants_wrinkles.tga b/indra/newview/character/bump_pants_wrinkles.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/bump_shirt_wrinkles.tga b/indra/newview/character/bump_shirt_wrinkles.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/bump_upperbody_base.tga b/indra/newview/character/bump_upperbody_base.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/checkerboard.tga b/indra/newview/character/checkerboard.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/eyebrows_alpha.tga b/indra/newview/character/eyebrows_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/eyeliner_alpha.tga b/indra/newview/character/eyeliner_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/eyeshadow_inner_alpha.tga b/indra/newview/character/eyeshadow_inner_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/eyeshadow_outer_alpha.tga b/indra/newview/character/eyeshadow_outer_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/eyewhite.tga b/indra/newview/character/eyewhite.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/facehair_chincurtains_alpha.tga b/indra/newview/character/facehair_chincurtains_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/facehair_moustache_alpha.tga b/indra/newview/character/facehair_moustache_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/facehair_sideburns_alpha.tga b/indra/newview/character/facehair_sideburns_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/facehair_soulpatch_alpha.tga b/indra/newview/character/facehair_soulpatch_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/freckles_alpha.tga b/indra/newview/character/freckles_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/genepool.xml b/indra/newview/character/genepool.xml old mode 100644 new mode 100755 diff --git a/indra/newview/character/glove_length_alpha.tga b/indra/newview/character/glove_length_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/gloves_fingers_alpha.tga b/indra/newview/character/gloves_fingers_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/head_alpha.tga b/indra/newview/character/head_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/head_color.tga b/indra/newview/character/head_color.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/head_hair.tga b/indra/newview/character/head_hair.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/head_highlights_alpha.tga b/indra/newview/character/head_highlights_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/head_shading_alpha.tga b/indra/newview/character/head_shading_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/head_skingrain.tga b/indra/newview/character/head_skingrain.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/jacket_length_lower_alpha.tga b/indra/newview/character/jacket_length_lower_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/jacket_length_upper_alpha.tga b/indra/newview/character/jacket_length_upper_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/jacket_open_lower_alpha.tga b/indra/newview/character/jacket_open_lower_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/jacket_open_upper_alpha.tga b/indra/newview/character/jacket_open_upper_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/lipgloss_alpha.tga b/indra/newview/character/lipgloss_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/lips_mask.tga b/indra/newview/character/lips_mask.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/lipstick_alpha.tga b/indra/newview/character/lipstick_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/lowerbody_color.tga b/indra/newview/character/lowerbody_color.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/lowerbody_highlights_alpha.tga b/indra/newview/character/lowerbody_highlights_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/lowerbody_shading_alpha.tga b/indra/newview/character/lowerbody_shading_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/nailpolish_alpha.tga b/indra/newview/character/nailpolish_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/pants_length_alpha.tga b/indra/newview/character/pants_length_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/pants_waist_alpha.tga b/indra/newview/character/pants_waist_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/rosyface_alpha.tga b/indra/newview/character/rosyface_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/rouge_alpha.tga b/indra/newview/character/rouge_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/shirt_bottom_alpha.tga b/indra/newview/character/shirt_bottom_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/shirt_collar_alpha.tga b/indra/newview/character/shirt_collar_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/shirt_collar_back_alpha.tga b/indra/newview/character/shirt_collar_back_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/shirt_sleeve_alpha.tga b/indra/newview/character/shirt_sleeve_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/shoe_height_alpha.tga b/indra/newview/character/shoe_height_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/skirt_length_alpha.tga b/indra/newview/character/skirt_length_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/skirt_slit_back_alpha.tga b/indra/newview/character/skirt_slit_back_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/skirt_slit_front_alpha.tga b/indra/newview/character/skirt_slit_front_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/skirt_slit_left_alpha.tga b/indra/newview/character/skirt_slit_left_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/skirt_slit_right_alpha.tga b/indra/newview/character/skirt_slit_right_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/underpants_trial_female.tga b/indra/newview/character/underpants_trial_female.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/underpants_trial_male.tga b/indra/newview/character/underpants_trial_male.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/undershirt_trial_female.tga b/indra/newview/character/undershirt_trial_female.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/upperbody_color.tga b/indra/newview/character/upperbody_color.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/upperbody_highlights_alpha.tga b/indra/newview/character/upperbody_highlights_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/upperbody_shading_alpha.tga b/indra/newview/character/upperbody_shading_alpha.tga old mode 100644 new mode 100755 diff --git a/indra/newview/character/upperbodyfreckles_alpha.tga b/indra/newview/character/upperbodyfreckles_alpha.tga old mode 100644 new mode 100755 -- cgit v1.2.3 From 806d09b1143894ad66cea2c228f467e8c39a8adf Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Tue, 30 Apr 2013 19:50:05 -0700 Subject: Merge 3.5.1 into Materials --- indra/newview/character/avatar_lad.xml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 99dbfcae51..41080818c9 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -1084,6 +1084,22 @@ scale="0 0 .5" /> + + + + + + + + -- cgit v1.2.3 From e413f4b335a2f4f5a1ca151c8ab67324a72ebaee Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Fri, 10 May 2013 15:13:07 -0700 Subject: Fixup merge diffs --- indra/newview/character/avatar_lad.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 41080818c9..e5b385f4aa 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -1084,7 +1084,7 @@ scale="0 0 .5" /> -