Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/

meow-7.2.2
Nyx (Neal Orman) 2010-01-04 18:36:37 -05:00
commit 7a2a5bf0d9
1 changed files with 9 additions and 3 deletions

View File

@ -5608,9 +5608,7 @@
<layer_set
body_region="head"
width="512"
height="512"
clear_alpha="false"
alpha_tga_file="head_alpha.tga">
height="512">
<layer
name="head bump base"
fixed_color = "128,128,128,255"
@ -6608,6 +6606,13 @@ render_pass="bump">
<texture
local_texture="head_bodypaint" />
</layer>
<layer
name="eyelash alpha"
visibility_mask="TRUE">
<texture
tga_file="head_alpha.tga"
file_is_mask="TRUE" />
</layer>
<layer
name="head alpha"
visibility_mask="TRUE">
@ -6620,6 +6625,7 @@ render_pass="bump">
local_texture="head_tattoo" />
</layer>
</layer_set>
<!-- =========================================================== -->