From 989207faf74b98928b6b3d6c4fe09b7b7973c627 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Mon, 4 Jan 2010 18:36:30 -0500
Subject: EXT-2974 Alpha mask textures not applied immediately

Eyelashes were causing the avatar's head to disappear on a non-cached
outfit if you created an alpha mask object through the appearance editor
even though you didn't select the head to be invisible. This would not
affect the baked texture, only the local composite.

No clue exactly why the symptom was what it was, but the way we were
using eyelashes was the source of the problem. Moving the special-case
eyelashes to an alpha mask layer fixes the issue.

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

(limited to 'indra/newview')

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