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

---
 .../skins/default/xui/en/panel_edit_universal.xml  | 171 +++++++++++++++++++++
 1 file changed, 171 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_edit_universal.xml

(limited to 'indra/newview/skins/default/xui/en/panel_edit_universal.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_edit_universal.xml b/indra/newview/skins/default/xui/en/panel_edit_universal.xml
new file mode 100644
index 0000000000..2d7821ed3a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_edit_universal.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+    background_visible="true"
+  follows="all"
+  height="400"
+  layout="topleft"
+  left="0"
+  name="edit_universal_panel"
+  top_pad="10"
+  width="333" >
+  <scroll_container
+     color="DkGray2"
+     follows="all"
+     height="400"
+     layout="topleft"
+     left="9"
+     name="avatar_universal_scroll"
+     opaque="true"
+     top_pad="10"
+     width="314">
+    <panel
+     border="false"
+       bg_alpha_color="DkGray2"
+       bg_opaque_color="DkGray2"
+       background_visible="true"
+       background_opaque="true"
+     follows="all"
+     height="800"
+     left="10"
+     layout="topleft"
+     name="avatar_universal_color_panel"
+     top="0"
+     width="313" >
+      <texture_picker
+       can_apply_immediately="true"
+       default_image_name="Default"
+       follows="left|top"
+       height="115"
+       label="Hair Tattoo"
+       layout="topleft"
+       left="20"
+       name="Hair Tattoo"
+       tool_tip="Click to choose a picture"
+       top_pad="10"
+       width="115" >
+        <texture_picker.commit_callback
+            function="TexturePicker.Commit" />
+      </texture_picker>
+      <texture_picker
+       can_apply_immediately="true"
+       default_image_name="Default"
+       follows="left|top"
+       height="115"
+       label="Eyes Tattoo"
+       layout="topleft"
+       left_pad="30"
+       name="Eyes Tattoo"
+       tool_tip="Click to choose a picture"
+       top_delta="0"
+       width="115" >
+        <texture_picker.commit_callback
+            function="TexturePicker.Commit" />
+      </texture_picker>
+      <texture_picker
+       can_apply_immediately="true"
+       default_image_name="Default"
+       follows="left|top"
+       height="115"
+       label="Left Arm Tattoo"
+       layout="topleft"
+       left="20"
+       name="Left Arm Tattoo"
+       tool_tip="Click to choose a picture"
+       top_pad="10"
+       width="115" >
+        <texture_picker.commit_callback
+            function="TexturePicker.Commit" />
+      </texture_picker>
+      <texture_picker
+       can_apply_immediately="true"
+       default_image_name="Default"
+       follows="left|top"
+       height="115"
+       label="Left Leg Tattoo"
+       layout="topleft"
+       left_pad="30"
+       name="Left Leg Tattoo"
+       tool_tip="Click to choose a picture"
+       top_delta="0"
+       width="115" >
+        <texture_picker.commit_callback
+            function="TexturePicker.Commit" />
+      </texture_picker>
+      <texture_picker
+       can_apply_immediately="true"
+       default_image_name="Default"
+       follows="left|top"
+       height="115"
+       label="Aux1 Tattoo"
+       layout="topleft"
+       left="20"
+       name="Aux1 Tattoo"
+       tool_tip="Click to choose a picture"
+       top_pad="10"
+       width="115" >
+        <texture_picker.commit_callback
+            function="TexturePicker.Commit" />
+      </texture_picker>
+      <texture_picker
+       can_apply_immediately="true"
+       default_image_name="Default"
+       follows="left|top"
+       height="115"
+       label="Aux2 Tattoo"
+       layout="topleft"
+       left_pad="30"
+       name="Aux2 Tattoo"
+       tool_tip="Click to choose a picture"
+       top_delta="0"
+       width="115" >
+        <texture_picker.commit_callback
+            function="TexturePicker.Commit" />
+      </texture_picker>
+      <texture_picker
+       can_apply_immediately="true"
+       default_image_name="Default"
+       follows="left|top"
+       height="115"
+       label="Aux3 Tattoo"
+       layout="topleft"
+       left="20"
+       name="Aux3 Tattoo"
+       tool_tip="Click to choose a picture"
+       top_pad="10"
+       width="115" >
+        <texture_picker.commit_callback
+            function="TexturePicker.Commit" />
+      </texture_picker>
+      <texture_picker
+         can_apply_immediately="true"
+         default_image_name="Default"
+         follows="left|top"
+         height="115"
+         label="Skirt Tattoo"
+         layout="topleft"
+         left_pad="30"
+         name="Skirt Tattoo"
+         tool_tip="Click to choose a picture"
+         top_delta="0"
+         width="115" >
+        <texture_picker.commit_callback
+            function="TexturePicker.Commit" />
+      </texture_picker>
+      <color_swatch
+       can_apply_immediately="true"
+       follows="left|top"
+       height="115"
+       label="Color/Tint"
+       layout="topleft"
+       left="30"
+       name="Color/Tint"
+       tool_tip="Click to open color picker"
+       top_pad="10"
+       width="115" >
+        <color_swatch.commit_callback
+            function="ColorSwatch.Commit" />
+      </color_swatch>
+    </panel>
+  </scroll_container>
+</panel>
+
-- 
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

---
 .../skins/default/xui/en/panel_edit_universal.xml  | 108 ++++++++++++++++-----
 1 file changed, 84 insertions(+), 24 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_universal.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_edit_universal.xml b/indra/newview/skins/default/xui/en/panel_edit_universal.xml
index 2d7821ed3a..4b60a3c339 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_universal.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_universal.xml
@@ -31,6 +31,72 @@
      name="avatar_universal_color_panel"
      top="0"
      width="313" >
+      <texture_picker
+       can_apply_immediately="true"
+       default_image_name="Default"
+       follows="left|top"
+       height="115"
+       label="Head Tattoo"
+       layout="topleft"
+       left="20"
+       top_pad="10"
+       name="Head Universal Tattoo"
+       tool_tip="Click to choose a picture"
+       
+       width="115" >
+        <texture_picker.commit_callback
+            function="TexturePicker.Commit" />
+      </texture_picker>
+      <texture_picker
+       can_apply_immediately="true"
+       default_image_name="Default"
+       follows="left|top"
+       height="115"
+       label="Upper Tattoo"
+       layout="topleft"
+       left_pad="30"
+       top_delta="0"
+       name="Upper Universal Tattoo"
+       tool_tip="Click to choose a picture"
+       
+       width="115" >
+        <texture_picker.commit_callback
+            function="TexturePicker.Commit" />
+      </texture_picker>
+      <texture_picker
+       can_apply_immediately="true"
+       default_image_name="Default"
+       follows="left|top"
+       height="115"
+       label="Lower Tattoo"
+       layout="topleft"
+       left="20"
+       top_pad="10"
+       name="Lower Universal Tattoo"
+       tool_tip="Click to choose a picture"
+       
+       width="115" >
+        <texture_picker.commit_callback
+            function="TexturePicker.Commit" />
+      </texture_picker>
+
+      <texture_picker
+         can_apply_immediately="true"
+         default_image_name="Default"
+         follows="left|top"
+         height="115"
+         label="Skirt Tattoo"
+         layout="topleft"
+         left_pad="30"
+         top_delta="0"
+         name="Skirt Tattoo"
+         tool_tip="Click to choose a picture"
+         
+         width="115" >
+        <texture_picker.commit_callback
+            function="TexturePicker.Commit" />
+      </texture_picker>
+      
       <texture_picker
        can_apply_immediately="true"
        default_image_name="Default"
@@ -39,9 +105,10 @@
        label="Hair Tattoo"
        layout="topleft"
        left="20"
+       top_pad="10"
        name="Hair Tattoo"
        tool_tip="Click to choose a picture"
-       top_pad="10"
+       
        width="115" >
         <texture_picker.commit_callback
             function="TexturePicker.Commit" />
@@ -54,9 +121,10 @@
        label="Eyes Tattoo"
        layout="topleft"
        left_pad="30"
+       top_delta="0"
        name="Eyes Tattoo"
        tool_tip="Click to choose a picture"
-       top_delta="0"
+       
        width="115" >
         <texture_picker.commit_callback
             function="TexturePicker.Commit" />
@@ -69,9 +137,10 @@
        label="Left Arm Tattoo"
        layout="topleft"
        left="20"
+       top_pad="10"
        name="Left Arm Tattoo"
        tool_tip="Click to choose a picture"
-       top_pad="10"
+       
        width="115" >
         <texture_picker.commit_callback
             function="TexturePicker.Commit" />
@@ -84,9 +153,10 @@
        label="Left Leg Tattoo"
        layout="topleft"
        left_pad="30"
+       top_delta="0"
        name="Left Leg Tattoo"
        tool_tip="Click to choose a picture"
-       top_delta="0"
+       
        width="115" >
         <texture_picker.commit_callback
             function="TexturePicker.Commit" />
@@ -99,9 +169,10 @@
        label="Aux1 Tattoo"
        layout="topleft"
        left="20"
+       top_pad="10"
        name="Aux1 Tattoo"
        tool_tip="Click to choose a picture"
-       top_pad="10"
+       
        width="115" >
         <texture_picker.commit_callback
             function="TexturePicker.Commit" />
@@ -114,9 +185,10 @@
        label="Aux2 Tattoo"
        layout="topleft"
        left_pad="30"
+       top_delta="0"
        name="Aux2 Tattoo"
        tool_tip="Click to choose a picture"
-       top_delta="0"
+       
        width="115" >
         <texture_picker.commit_callback
             function="TexturePicker.Commit" />
@@ -129,38 +201,26 @@
        label="Aux3 Tattoo"
        layout="topleft"
        left="20"
+       top_pad="10"
        name="Aux3 Tattoo"
        tool_tip="Click to choose a picture"
-       top_pad="10"
+       
        width="115" >
         <texture_picker.commit_callback
             function="TexturePicker.Commit" />
       </texture_picker>
-      <texture_picker
-         can_apply_immediately="true"
-         default_image_name="Default"
-         follows="left|top"
-         height="115"
-         label="Skirt Tattoo"
-         layout="topleft"
-         left_pad="30"
-         name="Skirt Tattoo"
-         tool_tip="Click to choose a picture"
-         top_delta="0"
-         width="115" >
-        <texture_picker.commit_callback
-            function="TexturePicker.Commit" />
-      </texture_picker>
+      
       <color_swatch
        can_apply_immediately="true"
        follows="left|top"
        height="115"
        label="Color/Tint"
        layout="topleft"
-       left="30"
+       left_pad="30"
+       top_delta="0"
        name="Color/Tint"
        tool_tip="Click to open color picker"
-       top_pad="10"
+       
        width="115" >
         <color_swatch.commit_callback
             function="ColorSwatch.Commit" />
-- 
cgit v1.2.3


From 5002be8cf678176a9e481de3f86738370d995cca Mon Sep 17 00:00:00 2001
From: Anchor <none@none>
Date: Wed, 28 Nov 2018 16:22:47 -0800
Subject: [SL-9858] - fix horizontal scrollbar overlapping buttons

---
 indra/newview/skins/default/xui/en/panel_edit_universal.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_universal.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_edit_universal.xml b/indra/newview/skins/default/xui/en/panel_edit_universal.xml
index 4b60a3c339..11cabdfe6e 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_universal.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_universal.xml
@@ -11,13 +11,13 @@
   <scroll_container
      color="DkGray2"
      follows="all"
-     height="400"
+     height="380"
      layout="topleft"
      left="9"
      name="avatar_universal_scroll"
      opaque="true"
      top_pad="10"
-     width="314">
+     width="323">
     <panel
      border="false"
        bg_alpha_color="DkGray2"
-- 
cgit v1.2.3