summaryrefslogtreecommitdiff
path: root/indra/newview/character
diff options
context:
space:
mode:
authorAnchor <none@none>2019-06-12 12:59:10 -0700
committerAnchor <none@none>2019-06-12 12:59:10 -0700
commit4aa24aa9da5210d7e07ff9d54ad0c10b69fde3f2 (patch)
tree68e518b1d1c2d4ce3ea799a25216300efbdb8c9b /indra/newview/character
parent565ca8fedddc3809c5d50b23b604d60007c50553 (diff)
[SL-11393] - use opaque bg on aux channels
Diffstat (limited to 'indra/newview/character')
-rw-r--r--indra/newview/character/aux_base.tgabin10284 -> 8236 bytes
-rw-r--r--indra/newview/character/avatar_lad.xml63
2 files changed, 46 insertions, 17 deletions
diff --git a/indra/newview/character/aux_base.tga b/indra/newview/character/aux_base.tga
index dbcaaaf2b1..d1319c767e 100644
--- a/indra/newview/character/aux_base.tga
+++ b/indra/newview/character/aux_base.tga
Binary files 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" />