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.

---
 .../skins/default/xui/en/floater_texture_ctrl.xml  | 72 ++++++++++++++++++++--
 1 file changed, 67 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 53618b684b..9bce037cba 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -52,7 +52,7 @@
      control_name="mode_selection"
      height="20"
      layout="topleft"
-     left="18"
+     left="0"
      top_pad="80"
      name="mode_selection"
      follows="left|top">
@@ -64,7 +64,7 @@
          height="16" 
          left="0" 
          value="0"
-         width="80" />
+         width="70" />
         <radio_item
          label="Local"
          left_pad="0"
@@ -73,7 +73,16 @@
          height="16" 
          name="local"
          value="1"
-         width="75" />
+         width="50" />
+       <radio_item
+         label="Bake"
+         left_pad="0"
+         layout="topleft"
+         top_delta="0"
+         height="16"
+         name="bake"
+         value="2"
+         width="50" />
     </radio_group>
 	<!-- -->
 	
@@ -83,7 +92,7 @@
      follows="left|top"
      height="14"
      layout="topleft"
-     left_delta="-12"
+     left_delta="12"
      name="unknown"
      top_pad="4">
         Size: [DIMENSIONS]
@@ -225,7 +234,60 @@
         <column name="unit_name" label="Name" dynamicwidth="true" />
         <column name="unit_id_HIDDEN" label="ID" width="0" />
     </scroll_list>
-     
+
+<!-- middle: bake mode -->
+  <combo_box
+         left="180"
+         top="30"
+			   height="19"
+			   top_delta="15"
+			   layout="topleft"
+			   follows="left|top"
+			   name="l_bake_use_texture_combo_box"
+			   tool_tip="Choose the bake texture"
+			   width="108"
+         visible="false">
+        <combo_box.item
+         label="None"
+         name="None"
+         value="-1" />
+        <combo_box.item
+         label="BAKED_HEAD"
+         name="BAKED_HEAD"
+         value="0" />
+        <combo_box.item
+         label="BAKED_UPPER"
+         name="BAKED_UPPER"
+         value="1" />
+        <combo_box.item
+         label="BAKED_LOWER"
+         name="BAKED_LOWER"
+         value="2" />
+        <combo_box.item
+         label="BAKED_EYES"
+         name="BAKED_EYES"
+         value="3" />
+        <combo_box.item
+         label="BAKED_SKIRT"
+         name="BAKED_SKIRT"
+         value="4" />
+        <combo_box.item
+         label="BAKED_HAIR"
+         name="BAKED_HAIR"
+         value="5" />
+  </combo_box>
+  <check_box
+     follows="left|top"
+     height="20"
+     initial_value="false"
+     label="Hide Base Mesh Region"
+     layout="topleft"
+     name="hide_base_mesh_region"
+     left_delta="0"
+     top_pad="10"
+     top_delta="0"
+     width="120" 
+     visible="false"/>
 <!-- bottom static -->
     <button
      follows="bottom"
-- 
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

---
 .../skins/default/xui/en/floater_texture_ctrl.xml  |  20 ++++
 .../skins/default/xui/en/panel_edit_tattoo.xml     | 125 ++++++++++++++++++++-
 .../skins/default/xui/en/panel_edit_wearable.xml   |   4 +-
 3 files changed, 145 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 9bce037cba..549f4aca28 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -275,6 +275,26 @@
          label="BAKED_HAIR"
          name="BAKED_HAIR"
          value="5" />
+        <combo_box.item
+          label="BAKED_LEFTARM"
+          name="BAKED_LEFTARM"
+          value="6" />
+        <combo_box.item
+          label="BAKED_LEFTLEG"
+          name="BAKED_LEFTLEG"
+          value="7" />
+        <combo_box.item
+         label="BAKED_AUX1"
+         name="BAKED_AUX1"
+         value="8" />
+        <combo_box.item
+           label="BAKED_AUX2"
+           name="BAKED_AUX2"
+           value="9" />
+        <combo_box.item
+         label="BAKED_AUX3"
+         name="BAKED_AUX3"
+         value="10" />
   </combo_box>
   <check_box
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
index 97f1a1a658..2870dc4b48 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
@@ -2,7 +2,7 @@
  <panel
      background_visible="true"
 	 follows="all"
-	 height="400"
+	 height="900"
 	 layout="topleft"
 	 left="0"
 	 name="edit_tattoo_panel"
@@ -15,7 +15,7 @@
       background_visible="true"
       background_opaque="true"
 	  follows="all"
-	  height="400" 
+	  height="900" 
 	  left="10" 
 	  layout="topleft" 
 	  name="avatar_tattoo_color_panel"
@@ -66,6 +66,127 @@
          <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>
+     <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>
+     
        <color_swatch
         can_apply_immediately="true"
         follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index f34b913218..97c830a421 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -3,7 +3,7 @@
  background_visible="true"
  bevel_style="in"
  follows="all"
- height="570"
+ height="700"
  help_topic="edit_wearable"
  label="Wearable"
  layout="topleft"
@@ -411,7 +411,7 @@
         <panel
          filename="panel_edit_tattoo.xml"
          follows="all"
-         height="425"
+         height="900"
          layout="topleft"
          left="0"
          name="edit_tattoo_panel"
-- 
cgit v1.2.3


From f277aed2186871ad7fd76de3a49348ed5ba94e3b Mon Sep 17 00:00:00 2001
From: Anchor Linden <anchor@lindenlab.com>
Date: Thu, 24 May 2018 01:17:07 -0700
Subject: [DRTVWR-455] - add new bake testure and tattoo slots

---
 .../skins/default/xui/en/floater_texture_ctrl.xml  |   2 +-
 .../skins/default/xui/en/panel_edit_tattoo.xml     | 417 +++++++++++----------
 .../skins/default/xui/en/panel_edit_wearable.xml   |   4 +-
 3 files changed, 217 insertions(+), 206 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 549f4aca28..d122d7491c 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -245,7 +245,7 @@
 			   follows="left|top"
 			   name="l_bake_use_texture_combo_box"
 			   tool_tip="Choose the bake texture"
-			   width="108"
+			   width="118"
          visible="false">
         <combo_box.item
          label="None"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
index 2870dc4b48..c304188ad3 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
@@ -1,206 +1,217 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
- <panel
-     background_visible="true"
-	 follows="all"
-	 height="900"
-	 layout="topleft"
-	 left="0"
-	 name="edit_tattoo_panel"
-	 top_pad="10"
-	 width="333" >
-	 <panel
-	  border="false"
-      bg_alpha_color="DkGray2"
-      bg_opaque_color="DkGray2"
-      background_visible="true"
-      background_opaque="true"
-	  follows="all"
-	  height="900" 
-	  left="10" 
-	  layout="topleft" 
-	  name="avatar_tattoo_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"
-        name="Head Tattoo"
-        tool_tip="Click to choose a picture"
-        top="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="Upper Tattoo"
-        layout="topleft"
-        left_pad="30"
-        name="Upper Tattoo"
-        tool_tip="Click to choose a picture"
-        top="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="Lower Tattoo"
-        layout="topleft"
-        left="20"
-        name="Lower 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>
-     <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>
-     
-       <color_swatch
-        can_apply_immediately="true"
-        follows="left|top"
-        height="115"
-        label="Color/Tint"
-        layout="topleft"
-        left_pad="30"
-        name="Color/Tint"
-        tool_tip="Click to open color picker"
-        top_delta="0"
-        width="115" >
-         <color_swatch.commit_callback
-             function="ColorSwatch.Commit" />
-       </color_swatch>
-	 </panel>
+<panel
+    background_visible="true"
+  follows="all"
+  height="400"
+  layout="topleft"
+  left="0"
+  name="edit_tattoo_panel"
+  top_pad="10"
+  width="333" >
+  <scroll_container
+     color="DkGray2"
+     follows="all"
+     height="400"
+     layout="topleft"
+     left="9"
+     name="avatar_tattoo_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_tattoo_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"
+       name="Head Tattoo"
+       tool_tip="Click to choose a picture"
+       top="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="Upper Tattoo"
+       layout="topleft"
+       left_pad="30"
+       name="Upper Tattoo"
+       tool_tip="Click to choose a picture"
+       top="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="Lower Tattoo"
+       layout="topleft"
+       left="20"
+       name="Lower 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>
+      <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>
+
+      <color_swatch
+       can_apply_immediately="true"
+       follows="left|top"
+       height="115"
+       label="Color/Tint"
+       layout="topleft"
+       left_pad="30"
+       name="Color/Tint"
+       tool_tip="Click to open color picker"
+       top_delta="0"
+       width="115" >
+        <color_swatch.commit_callback
+            function="ColorSwatch.Commit" />
+      </color_swatch>
+    </panel>
+  </scroll_container>
 </panel>
 
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 97c830a421..f34b913218 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -3,7 +3,7 @@
  background_visible="true"
  bevel_style="in"
  follows="all"
- height="700"
+ height="570"
  help_topic="edit_wearable"
  label="Wearable"
  layout="topleft"
@@ -411,7 +411,7 @@
         <panel
          filename="panel_edit_tattoo.xml"
          follows="all"
-         height="900"
+         height="425"
          layout="topleft"
          left="0"
          name="edit_tattoo_panel"
-- 
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

---
 .../skins/default/xui/en/menu_inventory.xml        |   8 +
 .../skins/default/xui/en/menu_inventory_add.xml    |   8 +
 .../skins/default/xui/en/menu_outfit_gear.xml      |   8 +
 .../skins/default/xui/en/panel_edit_tattoo.xml     | 121 +--------------
 .../skins/default/xui/en/panel_edit_universal.xml  | 171 +++++++++++++++++++++
 .../skins/default/xui/en/panel_edit_wearable.xml   |  18 +++
 indra/newview/skins/default/xui/en/strings.xml     |   4 +
 7 files changed, 218 insertions(+), 120 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_edit_universal.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 5b45364127..a9c036167f 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -275,6 +275,14 @@
              function="Inventory.DoCreate"
              parameter="tattoo" />
         </menu_item_call>
+      <menu_item_call
+         label="New Universal"
+         layout="topleft"
+         name="New Universal">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="universal" />
+      </menu_item_call>
         <menu_item_call
          label="New Physics"
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index afeb1bf226..29724b0270 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -194,6 +194,14 @@
                      function="Inventory.DoCreate"
                      parameter="tattoo" />
                 </menu_item_call>
+              <menu_item_call
+                 label="New Universal"
+                 layout="topleft"
+                 name="New Universal">
+                <menu_item_call.on_click
+                 function="Inventory.DoCreate"
+                 parameter="universal" />
+              </menu_item_call>
                 <menu_item_call
                  label="New Physics"
                  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index 7faa4f3d71..61cb74f230 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -175,6 +175,14 @@
                      function="Gear.Create"
                      parameter="tattoo" />
                 </menu_item_call>
+              <menu_item_call
+                 label="New Universal"
+                 layout="topleft"
+                 name="New Universal">
+                <menu_item_call.on_click
+                 function="Gear.Create"
+                 parameter="universal" />
+              </menu_item_call>
             </menu>
             <menu
              height="85"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
index c304188ad3..8fa85dce5f 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
@@ -76,126 +76,7 @@
         <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>
-      <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>
+      
 
       <color_swatch
        can_apply_immediately="true"
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>
+
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index f34b913218..dc1553e6a3 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -71,6 +71,10 @@
      name="edit_tattoo_title">
         Editing Tattoo
     </string>
+  <string
+   name="edit_universal_title">
+    Editing Universal
+  </string>
     <string
      name="edit_physics_title">
         Editing Physics
@@ -135,6 +139,10 @@
      name="tattoo_desc_text">
         Tattoo:
     </string>
+  <string
+     name="universal_desc_text">
+    Universal:
+  </string>
     <string
      name="physics_desc_text">
         Physics:
@@ -418,6 +426,16 @@
          top="8"
          visible="false"
          width="333" />
+      <panel
+         filename="panel_edit_universal.xml"
+         follows="all"
+         height="425"
+         layout="topleft"
+         left="0"
+         name="edit_universal_panel"
+         top="8"
+         visible="false"
+         width="333" />
         <panel
          filename="panel_edit_physics.xml"
          follows="all"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0a220e68fd..fa1dd41917 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2209,6 +2209,7 @@ For AI Character: Get the closest navigable point to the point provided.
 	<string name="skirt">Skirt</string>
 	<string name="alpha">Alpha</string>
 	<string name="tattoo">Tattoo</string>
+  <string name="universal">Universal</string>
   <string name="physics">Physics</string>
   <string name="invalid">invalid</string>
   <string name="none">none</string>
@@ -2225,6 +2226,7 @@ For AI Character: Get the closest navigable point to the point provided.
 	<string name="skirt_not_worn">Skirt not worn</string>
 	<string name="alpha_not_worn">Alpha not worn</string>
 	<string name="tattoo_not_worn">Tattoo not worn</string>
+  <string name="universal_not_worn">Universal not worn</string>
   <string name="physics_not_worn">Physics not worn</string>
 	<string name="invalid_not_worn">invalid</string>
 
@@ -2244,6 +2246,7 @@ For AI Character: Get the closest navigable point to the point provided.
 	<string name="create_new_skirt">Create new skirt</string>
 	<string name="create_new_alpha">Create new alpha</string>
 	<string name="create_new_tattoo">Create new tattoo</string>
+  <string name="create_new_universal">Create new universal</string>
   <string name="create_new_physics">Create new physics</string>
 	<string name="create_new_invalid">invalid</string>
 
@@ -3805,6 +3808,7 @@ Abuse Report</string>
   <string name="New Skirt">New Skirt</string>
   <string name="New Alpha">New Alpha</string>
   <string name="New Tattoo">New Tattoo</string>
+  <string name="New Universal">New Universal</string>
   <string name="New Physics">New Physics</string>
   <string name="Invalid Wearable">Invalid Wearable</string>
   <string name="New Gesture">New Gesture</string>
-- 
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')

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 ace5cb7d905000335a5ff3e8b74281b77d622a75 Mon Sep 17 00:00:00 2001
From: Anchor Linden <anchor@lindenlab.com>
Date: Wed, 27 Jun 2018 05:02:20 +0530
Subject: [MAINT-8753] - fix physics opened when click on universal

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index dcd8f0b495..e026ffa64c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3971,6 +3971,16 @@
                  function="Edit.EnableTakeOff"
                  parameter="tattoo" />
             </menu_item_call>
+            <menu_item_call
+             label="Universal"
+             name="Universal">
+              <menu_item_call.on_click
+               function="Edit.TakeOff"
+               parameter="tattoo" />
+              <menu_item_call.on_enable
+               function="Edit.EnableTakeOff"
+               parameter="universal" />
+            </menu_item_call>
             <menu_item_call
              label="Physics"
              name="Physics">
-- 
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')

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