summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-04 16:27:41 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-04 16:27:41 -0800
commitb139ebccd5e474c795d6fddc90955727c711c200 (patch)
tree29ae51b7feb17eed637ff7e7a28b72317fd02151 /indra
parentf446ae476752d2690422e60dc5419e59e3fd6b10 (diff)
parent7a2a5bf0d9e8d5e91b6db2080064669172216c7d (diff)
merge.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/character/avatar_lad.xml12
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index ae89eb4413..448e20b382 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -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"
@@ -6609,6 +6607,13 @@ render_pass="bump">
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">
<texture
@@ -6620,6 +6625,7 @@ render_pass="bump">
local_texture="head_tattoo" />
</layer>
+
</layer_set>
<!-- =========================================================== -->