From 8c7edbef183e284186da583c4c9b55fe2bc972d1 Mon Sep 17 00:00:00 2001
From: Anchor <none@none>
Date: Wed, 6 Sep 2017 03:24:58 -0700
Subject: 1024*1024 baking viewer updates

---
 indra/newview/character/avatar_lad.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'indra/newview/character')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 90f06746c9..ee620b39b8 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -8923,8 +8923,8 @@
   <!-- =========================================================== -->
   <layer_set
     body_region="hair"
-    width="512"
-    height="512"
+    width="1024"
+    height="1024"
     clear_alpha="false">
     <layer
       name="base"
@@ -8953,8 +8953,8 @@
 
   <layer_set
     body_region="head"
-    width="512"
-    height="512">
+    width="1024"
+    height="1024">
     <layer
        name="head bump base"
        fixed_color = "128,128,128,255"
@@ -10031,8 +10031,8 @@ render_pass="bump">
   <!-- =========================================================== -->
   <layer_set
    body_region="upper_body"
-   width="512"
-   height="512">
+   width="1024"
+   height="1024">
     <layer
      name="base_upperbody bump"
      render_pass="bump"
@@ -11282,8 +11282,8 @@ render_pass="bump">
   <!-- =========================================================== -->
   <layer_set
    body_region="lower_body"
-   width="512"
-   height="512">
+   width="1024"
+   height="1024">
     <layer
        name="lower body bump base"
        fixed_color = "128,128,128,255"
@@ -12241,8 +12241,8 @@ render_pass="bump">
   <!-- =========================================================== -->
   <layer_set
    body_region="skirt"
-   width="512"
-   height="512"
+   width="1024"
+   height="1024"
    clear_alpha="false">
     <layer
      name="skirt_fabric"
-- 
cgit v1.2.3


From bfbcd6d16931819c43eea8e83963c9f86c6892dd Mon Sep 17 00:00:00 2001
From: Anchor Linden <anchor@lindenlab.com>
Date: Wed, 28 Feb 2018 22:14:38 -0800
Subject: [MAINT-8081] - bakes on mesh. 1st pass. changed texture panel to
 select bakes on objects. handle magic bake ids in LLViewerObject.

---
 indra/newview/character/avatar_lad.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'indra/newview/character')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index ee620b39b8..90f06746c9 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -8923,8 +8923,8 @@
   <!-- =========================================================== -->
   <layer_set
     body_region="hair"
-    width="1024"
-    height="1024"
+    width="512"
+    height="512"
     clear_alpha="false">
     <layer
       name="base"
@@ -8953,8 +8953,8 @@
 
   <layer_set
     body_region="head"
-    width="1024"
-    height="1024">
+    width="512"
+    height="512">
     <layer
        name="head bump base"
        fixed_color = "128,128,128,255"
@@ -10031,8 +10031,8 @@ render_pass="bump">
   <!-- =========================================================== -->
   <layer_set
    body_region="upper_body"
-   width="1024"
-   height="1024">
+   width="512"
+   height="512">
     <layer
      name="base_upperbody bump"
      render_pass="bump"
@@ -11282,8 +11282,8 @@ render_pass="bump">
   <!-- =========================================================== -->
   <layer_set
    body_region="lower_body"
-   width="1024"
-   height="1024">
+   width="512"
+   height="512">
     <layer
        name="lower body bump base"
        fixed_color = "128,128,128,255"
@@ -12241,8 +12241,8 @@ render_pass="bump">
   <!-- =========================================================== -->
   <layer_set
    body_region="skirt"
-   width="1024"
-   height="1024"
+   width="512"
+   height="512"
    clear_alpha="false">
     <layer
      name="skirt_fabric"
-- 
cgit v1.2.3


From 3bf89821d9c9777a0f24d89280bd7a7011a7a3df Mon Sep 17 00:00:00 2001
From: Anchor Linden <anchor@lindenlab.com>
Date: Mon, 21 May 2018 16:00:52 -0700
Subject: [DRTVWR-455] - added 5 new bake channels

---
 indra/newview/character/avatar_lad.xml | 524 +++++++++++++++++++++++++++++++++
 1 file changed, 524 insertions(+)

(limited to 'indra/newview/character')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index df30f46002..6d49e22065 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -8947,6 +8947,66 @@
       <texture
          local_texture="hair_alpha" />
     </layer>
+    <layer
+       name="hair_tattoo">
+      <texture
+         local_texture="hair_tattoo" />
+      <param
+       id="1211"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_hair_red"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="255, 0, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1212"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_hair_green"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 255, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1213"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_hair_blue"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 0, 255, 255" />
+        </param_color>
+      </param>
+
+    </layer>
+
 
   </layer_set>
   <!-- =========================================================== -->
@@ -12235,6 +12295,66 @@ render_pass="bump">
       <texture
          local_texture="eyes_alpha" />
     </layer>
+    <layer
+       name="eyes_tattoo">
+      <texture
+         local_texture="eyes_tattoo" />
+      <param
+       id="924"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_eyes_red"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="255, 0, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="925"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_eyes_green"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 255, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="926"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_eyes_blue"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 0, 255, 255" />
+        </param_color>
+      </param>
+
+    </layer>
+
 
   </layer_set>
 
@@ -12415,6 +12535,410 @@ render_pass="bump">
          domain="0" />
       </param>
     </layer>
+    <layer
+       name="skirt_tattoo">
+      <texture
+         local_texture="skirt_tattoo" />
+      <param
+       id="1208"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_skirt_red"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="255, 0, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1209"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_skirt_green"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 255, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1210"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_skirt_blue"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 0, 255, 255" />
+        </param_color>
+      </param>
+
+    </layer>
+
+  </layer_set>
+
+  <!-- =========================================================== -->
+  <layer_set
+   body_region="leftarm"
+   width="512"
+   height="512"
+   clear_alpha="false">
+   
+    <layer
+       name="leftarm_tattoo">
+      <texture
+         local_texture="leftarm_tattoo" />
+      <param
+       id="1214"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_leftarm_red"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="255, 0, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1215"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_leftarm_green"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 255, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1216"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_leftarm_blue"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 0, 255, 255" />
+        </param_color>
+      </param>
+
+    </layer>
+
+  </layer_set>
+
+  <!-- =========================================================== -->
+  <layer_set
+   body_region="leftleg"
+   width="512"
+   height="512"
+   clear_alpha="false">
+
+    <layer
+       name="leftleg_tattoo">
+      <texture
+         local_texture="leftleg_tattoo" />
+      <param
+       id="1217"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_leftleg_red"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="255, 0, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1218"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_leftleg_green"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 255, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1219"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_leftleg_blue"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 0, 255, 255" />
+        </param_color>
+      </param>
+
+    </layer>
+
+  </layer_set>
+
+  <!-- =========================================================== -->
+  <layer_set
+   body_region="aux1"
+   width="512"
+   height="512"
+   clear_alpha="false">
+
+    <layer
+       name="aux1_tattoo">
+      <texture
+         local_texture="aux1_tattoo" />
+      <param
+       id="1220"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_aux1_red"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="255, 0, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1221"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_aux1_green"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 255, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1222"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_aux1_blue"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 0, 255, 255" />
+        </param_color>
+      </param>
+
+    </layer>
+
+  </layer_set>
+
+  <!-- =========================================================== -->
+  <layer_set
+   body_region="aux2"
+   width="512"
+   height="512"
+   clear_alpha="false">
+
+    <layer
+       name="aux2_tattoo">
+      <texture
+         local_texture="aux2_tattoo" />
+      <param
+       id="1223"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_aux2_red"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="255, 0, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1224"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_aux2_green"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 255, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1225"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_aux2_blue"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 0, 255, 255" />
+        </param_color>
+      </param>
+
+    </layer>
+
+  </layer_set>
+
+  <!-- =========================================================== -->
+  <layer_set
+   body_region="aux3"
+   width="512"
+   height="512"
+   clear_alpha="false">
+
+    <layer
+       name="aux3_tattoo">
+      <texture
+         local_texture="aux3_tattoo" />
+      <param
+       id="1226"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_aux3_red"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="255, 0, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1227"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_aux3_green"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 255, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1228"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="tattoo"
+       name="tattoo_aux3_blue"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 0, 255, 255" />
+        </param_color>
+      </param>
+
+    </layer>
 
   </layer_set>
 
-- 
cgit v1.2.3


From 56fc3222dce79d3b52d7e234dcb929f08bfda031 Mon Sep 17 00:00:00 2001
From: Anchor Linden <anchor@lindenlab.com>
Date: Fri, 8 Jun 2018 20:36:49 +0530
Subject: [DRTVWR-476] - create new wearable type

---
 indra/newview/character/avatar_lad.xml | 48 +++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'indra/newview/character')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 6d49e22065..559994e3c0 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -8955,7 +8955,7 @@
        id="1211"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_hair_red"
        value_min="0"
        value_max="1"
@@ -8973,7 +8973,7 @@
        id="1212"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_hair_green"
        value_min="0"
        value_max="1"
@@ -8991,7 +8991,7 @@
        id="1213"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_hair_blue"
        value_min="0"
        value_max="1"
@@ -12303,7 +12303,7 @@ render_pass="bump">
        id="924"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_eyes_red"
        value_min="0"
        value_max="1"
@@ -12321,7 +12321,7 @@ render_pass="bump">
        id="925"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_eyes_green"
        value_min="0"
        value_max="1"
@@ -12339,7 +12339,7 @@ render_pass="bump">
        id="926"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_eyes_blue"
        value_min="0"
        value_max="1"
@@ -12543,7 +12543,7 @@ render_pass="bump">
        id="1208"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_skirt_red"
        value_min="0"
        value_max="1"
@@ -12561,7 +12561,7 @@ render_pass="bump">
        id="1209"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_skirt_green"
        value_min="0"
        value_max="1"
@@ -12579,7 +12579,7 @@ render_pass="bump">
        id="1210"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_skirt_blue"
        value_min="0"
        value_max="1"
@@ -12612,7 +12612,7 @@ render_pass="bump">
        id="1214"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_leftarm_red"
        value_min="0"
        value_max="1"
@@ -12630,7 +12630,7 @@ render_pass="bump">
        id="1215"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_leftarm_green"
        value_min="0"
        value_max="1"
@@ -12648,7 +12648,7 @@ render_pass="bump">
        id="1216"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_leftarm_blue"
        value_min="0"
        value_max="1"
@@ -12681,7 +12681,7 @@ render_pass="bump">
        id="1217"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_leftleg_red"
        value_min="0"
        value_max="1"
@@ -12699,7 +12699,7 @@ render_pass="bump">
        id="1218"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_leftleg_green"
        value_min="0"
        value_max="1"
@@ -12717,7 +12717,7 @@ render_pass="bump">
        id="1219"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_leftleg_blue"
        value_min="0"
        value_max="1"
@@ -12750,7 +12750,7 @@ render_pass="bump">
        id="1220"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_aux1_red"
        value_min="0"
        value_max="1"
@@ -12768,7 +12768,7 @@ render_pass="bump">
        id="1221"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_aux1_green"
        value_min="0"
        value_max="1"
@@ -12786,7 +12786,7 @@ render_pass="bump">
        id="1222"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_aux1_blue"
        value_min="0"
        value_max="1"
@@ -12819,7 +12819,7 @@ render_pass="bump">
        id="1223"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_aux2_red"
        value_min="0"
        value_max="1"
@@ -12837,7 +12837,7 @@ render_pass="bump">
        id="1224"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_aux2_green"
        value_min="0"
        value_max="1"
@@ -12855,7 +12855,7 @@ render_pass="bump">
        id="1225"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_aux2_blue"
        value_min="0"
        value_max="1"
@@ -12888,7 +12888,7 @@ render_pass="bump">
        id="1226"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_aux3_red"
        value_min="0"
        value_max="1"
@@ -12906,7 +12906,7 @@ render_pass="bump">
        id="1227"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_aux3_green"
        value_min="0"
        value_max="1"
@@ -12924,7 +12924,7 @@ render_pass="bump">
        id="1228"
        group="1"
        edit_group="colorpicker_driven"
-       wearable="tattoo"
+       wearable="universal"
        name="tattoo_aux3_blue"
        value_min="0"
        value_max="1"
-- 
cgit v1.2.3


From 7abb0c99beec1d356ea03d0733adeab94408df41 Mon Sep 17 00:00:00 2001
From: Anchor Linden <anchor@lindenlab.com>
Date: Wed, 13 Jun 2018 01:09:27 +0530
Subject: [DRTVWR-476] - add universal head,upper,lower tattoos

---
 indra/newview/character/avatar_lad.xml | 174 +++++++++++++++++++++++++++++++++
 1 file changed, 174 insertions(+)

(limited to 'indra/newview/character')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 559994e3c0..418fa9b6e2 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -10084,7 +10084,65 @@ render_pass="bump">
       </param>
 
     </layer>
+    <layer
+      name="head_universal_tattoo">
+      <texture
+         local_texture="head_universal_tattoo" />
+      <param
+       id="1229"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="universal"
+       name="tattoo_head_universal_red"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="255, 0, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1230"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="universal"
+       name="tattoo_head_universal_green"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
 
+          <value
+           color="0, 255, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1231"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="universal"
+       name="tattoo_head_universal_blue"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 0, 255, 255" />
+        </param_color>
+      </param>
+
+    </layer>
 
   </layer_set>
 
@@ -10261,7 +10319,65 @@ render_pass="bump">
       </param>
 
     </layer>
+    <layer
+     name="upper_universal_tattoo">
+      <texture
+         local_texture="upper_universal_tattoo" />
+      <param
+       id="1232"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="universal"
+       name="tattoo_upper_universal_red"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="255, 0, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1233"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="universal"
+       name="tattoo_upper_universal_green"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 255, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1234"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="universal"
+       name="tattoo_upper_universal_blue"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
 
+          <value
+           color="0, 0, 255, 255" />
+        </param_color>
+      </param>
+
+    </layer>
 
     <layer
      name="upper_undershirt bump"
@@ -11513,7 +11629,65 @@ render_pass="bump">
       </param>
 
     </layer>
+    <layer
+    name="lower_universal_tattoo">
+      <texture
+         local_texture="lower_universal_tattoo" />
+      <param
+       id="1235"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="universal"
+       name="tattoo_lower_universal_red"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
 
+          <value
+           color="255, 0, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1236"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="universal"
+       name="tattoo_lower_universal_green"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 255, 0, 255" />
+        </param_color>
+      </param>
+
+      <param
+       id="1237"
+       group="1"
+       edit_group="colorpicker_driven"
+       wearable="universal"
+       name="tattoo_lower_universal_blue"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+        <param_color>
+          <value
+           color="0, 0, 0, 255" />
+
+          <value
+           color="0, 0, 255, 255" />
+        </param_color>
+      </param>
+
+    </layer>
     <layer
      name="lower_underpants bump"
      render_pass="bump"
-- 
cgit v1.2.3


From 8a13530ce4eeb481ee467fd3ec54f1ed7e9f632a Mon Sep 17 00:00:00 2001
From: Anchor Linden <anchor@lindenlab.com>
Date: Wed, 27 Jun 2018 03:08:06 +0530
Subject: [MAINT-8742] - fix color/tint on universal tattoos

---
 indra/newview/character/avatar_lad.xml | 270 +++++++++++++++++++++++++++++++++
 1 file changed, 270 insertions(+)

(limited to 'indra/newview/character')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 418fa9b6e2..e19fe9b785 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -16632,7 +16632,277 @@ render_pass="bump">
       </param_driver>
     </param>
 
+    <param
+     id="1029"
+     group="2"
+     wearable="universal"
+     edit_group="colorpicker"
+     name="tattoo_universal_red"
+     value_min="0"
+     value_max="1"
+     value_default="1">
+      <param_driver>
+        <driven
+         id="1229"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1232"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1235"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1208"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1211"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="924"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1214"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1217"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1220"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1223"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1226"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+        
+      </param_driver>
+    </param>
+
+    <param
+     id="1030"
+     group="2"
+     wearable="universal"
+     edit_group="colorpicker"
+     name="tattoo_universal_green"
+     value_min="0"
+     value_max="1"
+     value_default="1">
+      <param_driver>
+        <driven
+         id="1230"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1233"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1236"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1209"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1212"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="925"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1215"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1218"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1221"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1224"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1227"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+      </param_driver>
+    </param>
+
+    <param
+     id="1031"
+     group="2"
+     wearable="universal"
+     edit_group="colorpicker"
+     name="tattoo_universal_blue"
+     value_min="0"
+     value_max="1"
+     value_default="1">
+      <param_driver>
+        <driven
+         id="1231"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1234"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1237"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1210"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1213"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="926"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1216"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1219"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1222"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1225"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+        <driven
+         id="1228"
+         min1="0"
+         max1="1"
+         max2="1"
+         min2="1" />
+
+      </param_driver>
+    </param>
   <!-- ==PHYSICS PARAMETERS======================================= -->
+    
 
    <param
      id="1100"
-- 
cgit v1.2.3


From dcbf57ab2d3ec86d9e2b3ec7d3c627f37fe24392 Mon Sep 17 00:00:00 2001
From: Anchor Linden <anchor@lindenlab.com>
Date: Sun, 15 Jul 2018 21:33:02 +0530
Subject: [MAINT-8846] - fixing duplicate id in avatar_lad.xml fixrs character
 test female crash. code cleanup.

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

(limited to 'indra/newview/character')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index e19fe9b785..8f4ba2bd32 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -16633,7 +16633,7 @@ render_pass="bump">
     </param>
 
     <param
-     id="1029"
+     id="1238"
      group="2"
      wearable="universal"
      edit_group="colorpicker"
@@ -16723,7 +16723,7 @@ render_pass="bump">
     </param>
 
     <param
-     id="1030"
+     id="1239"
      group="2"
      wearable="universal"
      edit_group="colorpicker"
@@ -16813,7 +16813,7 @@ render_pass="bump">
     </param>
 
     <param
-     id="1031"
+     id="1240"
      group="2"
      wearable="universal"
      edit_group="colorpicker"
-- 
cgit v1.2.3


From 713daebc414da6cdc40b4a3e37748df3af0a8290 Mon Sep 17 00:00:00 2001
From: Anchor <none@none>
Date: Tue, 30 Apr 2019 15:46:00 -0600
Subject: [SL-10823] - fix for black alpha aux layers

---
 indra/newview/character/aux_base.tga   | Bin 0 -> 10284 bytes
 indra/newview/character/avatar_lad.xml |  41 +++++++++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/character/aux_base.tga

(limited to 'indra/newview/character')

diff --git a/indra/newview/character/aux_base.tga b/indra/newview/character/aux_base.tga
new file mode 100644
index 0000000000..dbcaaaf2b1
Binary files /dev/null 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 8f4ba2bd32..2cdd86267e 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -12777,7 +12777,14 @@ render_pass="bump">
    width="512"
    height="512"
    clear_alpha="false">
-   
+	  <layer
+     name="base"
+	 write_all_channels="true"
+	 fixed_color = "128,128,128,255">
+		  <texture
+		   tga_file="aux_base.tga" />
+	  </layer>
+	  
     <layer
        name="leftarm_tattoo">
       <texture
@@ -12846,7 +12853,13 @@ render_pass="bump">
    width="512"
    height="512"
    clear_alpha="false">
-
+	  <layer
+     name="base"
+	 write_all_channels="true"
+	 fixed_color = "128,128,128,255">
+		  <texture
+		   tga_file="aux_base.tga" />
+	  </layer>
     <layer
        name="leftleg_tattoo">
       <texture
@@ -12916,6 +12929,14 @@ render_pass="bump">
    height="512"
    clear_alpha="false">
 
+	  <layer
+     name="base"
+	 write_all_channels="true"
+	 fixed_color = "128,128,128,255">
+		  <texture
+		   tga_file="aux_base.tga" />
+	  </layer>
+	  
     <layer
        name="aux1_tattoo">
       <texture
@@ -12985,6 +13006,14 @@ render_pass="bump">
    height="512"
    clear_alpha="false">
 
+	  <layer
+     name="base"
+	 write_all_channels="true"
+	 fixed_color = "128,128,128,255">
+		  <texture
+		   tga_file="aux_base.tga" />
+	  </layer>
+	  
     <layer
        name="aux2_tattoo">
       <texture
@@ -13054,6 +13083,14 @@ render_pass="bump">
    height="512"
    clear_alpha="false">
 
+	  <layer
+     name="base"
+	 write_all_channels="true"
+	 fixed_color = "128,128,128,255">
+		  <texture
+		   tga_file="aux_base.tga" />
+	  </layer>
+	  
     <layer
        name="aux3_tattoo">
       <texture
-- 
cgit v1.2.3


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/newview/character')

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


From a8a2265e624f9e990941795574820b15f2ac600c Mon Sep 17 00:00:00 2001
From: Anchor <none@none>
Date: Fri, 14 Jun 2019 12:03:00 -0700
Subject: 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(-)

(limited to 'indra/newview/character')

diff --git a/indra/newview/character/aux_base.tga b/indra/newview/character/aux_base.tga
index d1319c767e..dbcaaaf2b1 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 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" />
-- 
cgit v1.2.3