From 4aa24aa9da5210d7e07ff9d54ad0c10b69fde3f2 Mon Sep 17 00:00:00 2001
From: Anchor <none@none>
Date: Wed, 12 Jun 2019 12:59:10 -0700
Subject: [SL-11393] - use opaque bg on aux channels

---
 indra/newview/character/aux_base.tga   | Bin 10284 -> 8236 bytes
 indra/newview/character/avatar_lad.xml |  63 ++++++++++++++++++++++++---------
 2 files changed, 46 insertions(+), 17 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/character/aux_base.tga b/indra/newview/character/aux_base.tga
index dbcaaaf2b1..d1319c767e 100644
Binary files a/indra/newview/character/aux_base.tga and b/indra/newview/character/aux_base.tga differ
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 2cdd86267e..00bb694bc5 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -12780,11 +12780,16 @@ render_pass="bump">
 	  <layer
      name="base"
 	 write_all_channels="true"
-	 fixed_color = "128,128,128,255">
+	 fixed_color = "0,0,0,255">
 		  <texture
 		   tga_file="aux_base.tga" />
 	  </layer>
-	  
+	  <layer
+		name="base alpha layer"
+		visibility_mask="TRUE">
+		  <texture
+			 tga_file="aux_base.tga" />
+	  </layer> 
     <layer
        name="leftarm_tattoo">
       <texture
@@ -12856,11 +12861,17 @@ render_pass="bump">
 	  <layer
      name="base"
 	 write_all_channels="true"
-	 fixed_color = "128,128,128,255">
+	 fixed_color = "0,0,0,255">
 		  <texture
 		   tga_file="aux_base.tga" />
 	  </layer>
-    <layer
+	  <layer
+		name="base alpha layer"
+		visibility_mask="TRUE">
+		  <texture
+			 tga_file="aux_base.tga" />
+	  </layer>
+	  <layer
        name="leftleg_tattoo">
       <texture
          local_texture="leftleg_tattoo" />
@@ -12932,12 +12943,18 @@ render_pass="bump">
 	  <layer
      name="base"
 	 write_all_channels="true"
-	 fixed_color = "128,128,128,255">
+	 fixed_color = "0,0,0,255">
 		  <texture
 		   tga_file="aux_base.tga" />
 	  </layer>
-	  
-    <layer
+	  <layer
+		name="base alpha layer"
+		visibility_mask="TRUE">
+		  <texture
+			 tga_file="aux_base.tga" />
+	  </layer>
+
+	  <layer
        name="aux1_tattoo">
       <texture
          local_texture="aux1_tattoo" />
@@ -13007,14 +13024,20 @@ render_pass="bump">
    clear_alpha="false">
 
 	  <layer
-     name="base"
-	 write_all_channels="true"
-	 fixed_color = "128,128,128,255">
+	  name="base"
+	  write_all_channels="true"
+	  fixed_color = "0,0,0,255">
 		  <texture
 		   tga_file="aux_base.tga" />
 	  </layer>
-	  
-    <layer
+	  <layer
+		name="base alpha layer"
+		visibility_mask="TRUE">
+		  <texture
+			 tga_file="aux_base.tga" />
+	  </layer>
+
+	  <layer
        name="aux2_tattoo">
       <texture
          local_texture="aux2_tattoo" />
@@ -13084,14 +13107,20 @@ render_pass="bump">
    clear_alpha="false">
 
 	  <layer
-     name="base"
-	 write_all_channels="true"
-	 fixed_color = "128,128,128,255">
+	  name="base"
+	  write_all_channels="true"
+	  fixed_color = "0,0,0,255">
 		  <texture
 		   tga_file="aux_base.tga" />
 	  </layer>
-	  
-    <layer
+	  <layer
+		name="base alpha layer"
+		visibility_mask="TRUE">
+		  <texture
+			 tga_file="aux_base.tga" />
+	  </layer>
+
+	  <layer
        name="aux3_tattoo">
       <texture
          local_texture="aux3_tattoo" />
-- 
cgit v1.2.3