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

---
 indra/newview/llpaneleditwearable.cpp              |   2 +-
 .../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 +-
 indra/newview/tests/lldateutil_test.cpp            |   2 +-
 indra/newview/tests/llworldmap_test.cpp            |   2 +-
 6 files changed, 220 insertions(+), 209 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index 0ee1d451c0..73534bf495 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -369,7 +369,7 @@ LLEditWearableDictionary::TextureCtrls::TextureCtrls()
 		addEntry (TEX_LEFT_LEG_TATTOO, new PickerControlEntry(TEX_LEFT_LEG_TATTOO, "Left Leg Tattoo", LLUUID::null, TRUE));
 		addEntry (TEX_AUX1_TATTOO, new PickerControlEntry(TEX_AUX1_TATTOO, "Aux1 Tattoo", LLUUID::null, TRUE));
 		addEntry (TEX_AUX2_TATTOO, new PickerControlEntry(TEX_AUX2_TATTOO, "Aux2 Tattoo", LLUUID::null, TRUE));
-		addEntry (TEX_AUX3_BAKED, new PickerControlEntry(TEX_AUX3_TATTOO, "Aux3 Tattoo", LLUUID::null, TRUE));
+		addEntry (TEX_AUX3_TATTOO, new PickerControlEntry(TEX_AUX3_TATTOO, "Aux3 Tattoo", LLUUID::null, TRUE));
 }
 
 LLEditWearableDictionary::PickerControlEntry::PickerControlEntry(ETextureIndex tex_index,
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"
diff --git a/indra/newview/tests/lldateutil_test.cpp b/indra/newview/tests/lldateutil_test.cpp
index 47353962e1..62158d8f66 100644
--- a/indra/newview/tests/lldateutil_test.cpp
+++ b/indra/newview/tests/lldateutil_test.cpp
@@ -45,7 +45,7 @@ std::map< std::string, std::string > gString;
 typedef std::pair< std::string, int > count_string_t;
 std::map< count_string_t, std::string > gCountString;
 
-std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args)
+std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args, bool def_string)
 {
 	std::string text = gString[xml_desc];
 	LLStringUtil::format(text, args);
diff --git a/indra/newview/tests/llworldmap_test.cpp b/indra/newview/tests/llworldmap_test.cpp
index 84194adb5d..f1dd8acccf 100644
--- a/indra/newview/tests/llworldmap_test.cpp
+++ b/indra/newview/tests/llworldmap_test.cpp
@@ -66,7 +66,7 @@ void LLWorldMipmap::equalizeBoostLevels() { }
 LLPointer<LLViewerFetchedTexture> LLWorldMipmap::getObjectsTile(U32 grid_x, U32 grid_y, S32 level, bool load) { return NULL; }
 
 // Stub other stuff
-std::string LLTrans::getString(const std::string &, const LLStringUtil::format_map_t& ) { return std::string("test_trans"); }
+std::string LLTrans::getString(const std::string &, const LLStringUtil::format_map_t&, bool def_string) { return std::string("test_trans"); }
 void LLUIString::updateResult() const { }
 void LLUIString::setArg(const std::string& , const std::string& ) { }
 void LLUIString::assign(const std::string& ) { }
-- 
cgit v1.2.3