summaryrefslogtreecommitdiff
path: root/indra/newview/character
diff options
context:
space:
mode:
authorAnchor <none@none>2019-06-14 12:03:00 -0700
committerAnchor <none@none>2019-06-14 12:03:00 -0700
commita8a2265e624f9e990941795574820b15f2ac600c (patch)
treeb211128513b696e2581e89e9a86df9e7ce5d75a1 /indra/newview/character
parent4aa24aa9da5210d7e07ff9d54ad0c10b69fde3f2 (diff)
Backed out changeset: 4a4c5e6ff01e
Diffstat (limited to 'indra/newview/character')
-rw-r--r--indra/newview/character/aux_base.tgabin8236 -> 10284 bytes
-rw-r--r--indra/newview/character/avatar_lad.xml63
2 files changed, 17 insertions, 46 deletions
diff --git a/indra/newview/character/aux_base.tga b/indra/newview/character/aux_base.tga
index d1319c767e..dbcaaaf2b1 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 00bb694bc5..2cdd86267e 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" />