From 58f813a136a5a889e01b39e96714af91402321ba Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Tue, 2 Feb 2010 14:45:42 -0800
Subject: merge

---
 indra/newview/character/avatar_lad.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'indra/newview/character')

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"
@@ -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>
 
   <!-- =========================================================== -->
-- 
cgit v1.2.3