From a8a2265e624f9e990941795574820b15f2ac600c Mon Sep 17 00:00:00 2001
From: Anchor <none@none>
Date: Fri, 14 Jun 2019 12:03:00 -0700
Subject: [PATCH] Backed out changeset: 4a4c5e6ff01e
---
indra/newview/character/aux_base.tga | Bin 8236 -> 10284 bytes
indra/newview/character/avatar_lad.xml | 63 +++++++------------------
2 files changed, 17 insertions(+), 46 deletions(-)
diff --git a/indra/newview/character/aux_base.tga b/indra/newview/character/aux_base.tga
index d1319c767e29ef3528c944059d3074176d0e6ebe..dbcaaaf2b192d7dcc184e46e83c8815a26cd80ea 100644
GIT binary patch
literal 10284
zcmeI&%L#x$3<bcjUc@SFK)YCBK@|L9|Ba{@?LnA#NCDwxPKjvZON!Li*OSVy13hpC
zC?FvTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*(2}wvo5|WUFBqSjTe<k7j
S4Y)0PKFV6=sXK=<=00v|xc>71
literal 8236
zcmeI&y9t0m5CqWWLMyNd?c#(5QSgWTH=-umgYXt6m~?pIMl|tViPFaPRIvdA3^2d|
z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJgPHt>D}Y|CDcTyvhfbI7swaRa_$
B{d)ia
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 00bb694bc51..2cdd86267ee 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -12780,16 +12780,11 @@ render_pass="bump">
<layer
name="base"
write_all_channels="true"
- fixed_color = "0,0,0,255">
+ fixed_color = "128,128,128,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
@@ -12861,17 +12856,11 @@ render_pass="bump">
<layer
name="base"
write_all_channels="true"
- fixed_color = "0,0,0,255">
+ fixed_color = "128,128,128,255">
<texture
tga_file="aux_base.tga" />
</layer>
- <layer
- name="base alpha layer"
- visibility_mask="TRUE">
- <texture
- tga_file="aux_base.tga" />
- </layer>
- <layer
+ <layer
name="leftleg_tattoo">
<texture
local_texture="leftleg_tattoo" />
@@ -12943,18 +12932,12 @@ render_pass="bump">
<layer
name="base"
write_all_channels="true"
- fixed_color = "0,0,0,255">
+ fixed_color = "128,128,128,255">
<texture
tga_file="aux_base.tga" />
</layer>
- <layer
- name="base alpha layer"
- visibility_mask="TRUE">
- <texture
- tga_file="aux_base.tga" />
- </layer>
-
- <layer
+
+ <layer
name="aux1_tattoo">
<texture
local_texture="aux1_tattoo" />
@@ -13024,20 +13007,14 @@ render_pass="bump">
clear_alpha="false">
<layer
- name="base"
- write_all_channels="true"
- fixed_color = "0,0,0,255">
+ name="base"
+ write_all_channels="true"
+ fixed_color = "128,128,128,255">
<texture
tga_file="aux_base.tga" />
</layer>
- <layer
- name="base alpha layer"
- visibility_mask="TRUE">
- <texture
- tga_file="aux_base.tga" />
- </layer>
-
- <layer
+
+ <layer
name="aux2_tattoo">
<texture
local_texture="aux2_tattoo" />
@@ -13107,20 +13084,14 @@ render_pass="bump">
clear_alpha="false">
<layer
- name="base"
- write_all_channels="true"
- fixed_color = "0,0,0,255">
+ name="base"
+ write_all_channels="true"
+ fixed_color = "128,128,128,255">
<texture
tga_file="aux_base.tga" />
</layer>
- <layer
- name="base alpha layer"
- visibility_mask="TRUE">
- <texture
- tga_file="aux_base.tga" />
- </layer>
-
- <layer
+
+ <layer
name="aux3_tattoo">
<texture
local_texture="aux3_tattoo" />
--
GitLab