Small updates to bulky thumbs but mainly, this is about the first version of the Inventory Thumbnail Helper tool - see source file for a link to Confluence page listing how to use it

3 files changed, 51 insertions, 11 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
index e94717f947..d23fd1247f 100644
--- a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
@@ -44,14 +44,23 @@
       left="10"
       name="merge_items_textures"
       bottom="8"
-      width="200" />
+      width="100" />
     <button
       follows="left|bottom"
       height="20"
       label="Write Thumbnails"
       layout="bottomleft"
-      left="250"
+      left="150"
       name="write_items_thumbnails"
       bottom="8"
-      width="200" />
+      width="100" />
+    <button
+      follows="left|bottom"
+      height="20"
+      label="Missing Thumbnails"
+      layout="bottomleft"
+      left="250"
+      name="display_thumbless_items"
+      bottom="8"
+      width="100" />
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
index 512bce2475..aa3500bac2 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
@@ -9,7 +9,7 @@
   name="contents"
   help_topic="contents"
   title="Inventory Thumbnails Helper"
-  width="500">
+  width="800">
     <scroll_list
        top="20"
        height="350"
@@ -23,14 +23,20 @@
        right="-8"
        tool_tip="Paste items from your inventory">
         <scroll_list.columns
+             dynamic_width="true"
              label="Inventory Item"
-             name="name"
-             relative_width="0.40" />
+             name="item_name"
+             relative_width="0.4" />
+        <scroll_list.columns
+             dynamic_width="true"
+             label="Existing Texture"
+             name="existing_texture"
+             relative_width="0.3" />
         <scroll_list.columns
              dynamic_width="true"
-             label="Texture Name"
-             name="texture"
-             relative_width="0.6" />
+             label="New Texture"
+             name="new_texture"
+             relative_width="0.3" />
     </scroll_list>
     <text_editor
       top="375"
@@ -73,10 +79,21 @@
     <button
       follows="left|bottom"
       height="20"
-      label="List items with no thumb"
+      label="Log items with no thumbnail"
       layout="bottomleft"
       right="-10"
-      name="list_items_no_thumb_btn"
+      name="log_missing_thumbnails_btn"
       bottom="60"
       width="235" />
+    <button
+      follows="left|bottom"
+      height="20"
+      label="Clear thumbnails from pasted items"
+      layout="bottomleft"
+      right="-10"
+      name="clear_thumbnails_btn"
+      top_delta="26"
+      width="235" />
+
+
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ef720e65e3..45020163ef 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12074,4 +12074,18 @@ Would you like to save them first?
        yestext="Yes"/>
   </notification>
     
+    <notification
+  icon="alertmodal.tga"
+  name="ClearInventoryThumbnailsWarning"
+  type="alertmodal">
+        You are about to remove thumbnail images from the inventory items in the list. This change cannot be undone.
+
+        Would you like to proceed?
+        <tag>confirm</tag>
+        <usetemplate
+         name="okcancelbuttons"
+         notext="No"
+         yestext="Yes"/>
+    </notification>
+    
 </notifications>