diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-05-22 09:58:47 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-05-22 09:58:47 +0000 |
| commit | 9dfe0ca9a0228c4fa75c8a3e51840696cc6b4960 (patch) | |
| tree | 3136e0a32cdcb1d55a4c3a5a67791ca128d947a5 /indra/newview/character | |
| parent | 93cf3d89e51835dd2f61c32b16191ab724528055 (diff) | |
svn merge -r121194:121210
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1
QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
Diffstat (limited to 'indra/newview/character')
| -rw-r--r-- | indra/newview/character/avatar_lad.xml | 104 |
1 files changed, 51 insertions, 53 deletions
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index f484167cab..0ed5663ec1 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -5615,13 +5615,31 @@ </param> </layer> - <layer - name="head_bodypaint"> - <texture - local_texture="head_bodypaint" /> - </layer> + <layer + name="highlight"> + <texture + tga_file="head_highlights_alpha.tga" + file_is_mask="TRUE" /> - <layer + + <param + id="159" + group="1" + name="Shading" + wearable="skin" + value_min="0" + value_max="1"> + <param_color> + <value + color="255, 255, 255, 0" /> + + + <value + color="255, 255, 255, 64" /> + </param_color> + </param> + </layer> + <layer name="rosyface"> <texture tga_file="rosyface_alpha.tga" @@ -5651,52 +5669,6 @@ </layer> <layer - name="freckles" - fixed_color="120,47,20,128"> - <param - id="165" - group="0" - wearable="skin" - edit_group="skin_facedetail" - edit_group_order="2" - name="Freckles" - label_min="Less" - label_max="More" - value_min="0" - value_max="1" - camera_distance=".3" - camera_elevation=".07"> - <param_alpha - tga_file="freckles_alpha.tga" - skip_if_zero="true" - domain="0.5" /> - </param> - </layer> - - <layer - name="highlight"> - <texture - tga_file="head_highlights_alpha.tga" - file_is_mask="TRUE" /> - - <param - id="159" - group="1" - name="Shading" - wearable="skin" - value_min="0" - value_max="1"> - <param_color> - <value - color="255, 255, 255, 0" /> - - <value - color="255, 255, 255, 64" /> - </param_color> - </param> - </layer> - - <layer name="lips"> <texture tga_file="lips_mask.tga" @@ -5757,8 +5729,29 @@ domain="0.3" /> </param> </layer>--> - <layer + name="freckles" + fixed_color="120,47,20,128"> + <param + id="165" + group="0" + wearable="skin" + edit_group="skin_facedetail" + edit_group_order="2" + name="Freckles" + label_min="Less" + label_max="More" + value_min="0" + value_max="1" + camera_distance=".3" + camera_elevation=".07"> + <param_alpha + tga_file="freckles_alpha.tga" + skip_if_zero="true" + domain="0.5" /> + </param> + </layer> + <layer name="eyebrowsbump" render_pass="bump"> <texture @@ -6546,6 +6539,11 @@ </param> </layer> + <layer + name="head_bodypaint"> + <texture + local_texture="head_bodypaint" /> + </layer> </layer_set> <!-- =========================================================== --> |