From 1140ae3489a9e260a0abb808b4152f2d57384d67 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Thu, 29 Dec 2022 19:51:33 +0100
Subject: Add a texture inspector and show it when hovering over an inventory
 textory (or folder containing - among others - exactly one texture) and when
 hovering over notecard embedded textures

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/inspect_texture.xml b/indra/newview/skins/default/xui/en/inspect_texture.xml
new file mode 100644
index 0000000000..30be90cfa0
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/inspect_texture.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater
+ legacy_header_height="25"
+ bevel_style="in"
+ bg_opaque_image="Inspector_Background" 
+ can_close="false"
+ can_minimize="false"
+ height="295"
+ layout="topleft"
+ name="inspect_texture"
+ single_instance="true"
+ sound_flags="0"
+ visible="true"
+ width="250">
+  <texture_picker
+   enabled="false"
+   fallback_image="default_land_picture.j2c"
+   follows="all"
+   height="262"
+   layout="topleft"
+   left="5"
+   name="texture_ctrl"
+   top_pad="5"
+   width="240" />
+  <text
+   follows="top|left"
+   font="SansSerifSmall"
+   height="16"
+   left="7"
+   name="texture_name"
+   parse_urls="false"
+   right="-7"
+   top_delta="244"
+   text_color="White"
+   translate="false"
+   use_ellipses="true"
+   word_wrap="true"
+   value="Name of the texture goes here" />
+  <button
+   bottom="-5"
+   follows="bottom|left"
+   height="23"
+   label="Open"
+   left="7"
+   name="open_btn"
+   width="115"
+   commit_callback.function="InspectTexture.Open"
+   enable_callback.function="InspectTexture.CanOpen" />
+  <button
+   bottom="-5"
+   follows="bottom|left"
+   height="23"
+   label="Copy to Inventory"
+   left_pad="5"
+   name="copy_btn"
+   width="115"
+   commit_callback.function="InspectTexture.CopyToInv"
+   enable_callback.function="InspectTexture.CanCopyToInv" />
+</floater>
-- 
cgit v1.2.3


From ac3f1b54ec6484442ea302570c14707e8bb263d2 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <mnikolenko@productengine.com>
Date: Wed, 1 Feb 2023 18:44:26 +0200
Subject: SL-19104 Clean up inventory UI to prepare for thumbnails (#66)

---
 .../default/xui/en/menu_inventory_gear_default.xml |  93 ++++---------
 .../xui/en/menu_inventory_search_visibility.xml    |  11 ++
 .../default/xui/en/menu_inventory_view_default.xml |  53 ++++++++
 .../skins/default/xui/en/panel_main_inventory.xml  | 151 ++++++++-------------
 .../skins/default/xui/en/sidepanel_inventory.xml   | 125 +----------------
 5 files changed, 153 insertions(+), 280 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_inventory_view_default.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index 3eacdbc781..3fb2e01e5b 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -7,60 +7,32 @@
  name="menu_gear_default"
  visible="false">
     <menu_item_call
-     label="New Inventory Window"
+     label="New Folder Window"
      layout="topleft"
-     shortcut="control|shift|I"
-     name="new_window">
+     shortcut="control|shift|J"
+     enabled="false"
+     name="new_single_folder">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
          parameter="new_window" />
     </menu_item_call>
-    <menu_item_separator
-     layout="topleft" />
-    <menu_item_check
-     label="Sort by Name"
-     layout="topleft"
-     name="sort_by_name">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="sort_by_name" />
-        <on_check
-         function="Inventory.GearDefault.Check"
-         parameter="sort_by_name" />
-    </menu_item_check>
-    <menu_item_check
-     label="Sort by Most Recent"
-     layout="topleft"
-     name="sort_by_recent">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="sort_by_recent" />
-        <on_check
-         function="Inventory.GearDefault.Check"
-         parameter="sort_by_recent" />         
-    </menu_item_check>
-    <menu_item_check
-     label="Sort Folders Always by Name"
+    <menu_item_call
+     label="New Inventory Window"
      layout="topleft"
-     name="sort_folders_by_name">
+     shortcut="control|shift|I"
+     name="new_window">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
-         parameter="sort_folders_by_name" />
-        <on_check
-         function="Inventory.GearDefault.Check"
-         parameter="sort_folders_by_name" />
-    </menu_item_check>
-    <menu_item_check
-     label="Sort System Folders to Top"
+         parameter="new_window" />
+    </menu_item_call>
+    <menu_item_call
+     label="Close All Folders"
      layout="topleft"
-     name="sort_system_folders_to_top">
+     name="close_folders">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
-         parameter="sort_system_folders_to_top" />
-        <on_check
-         function="Inventory.GearDefault.Check"
-         parameter="sort_system_folders_to_top" />
-    </menu_item_check>
+         parameter="close_folders" />
+    </menu_item_call>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
@@ -79,29 +51,6 @@
          function="Inventory.GearDefault.Custom.Action"
          parameter="reset_filters" />
     </menu_item_call>
-    <menu_item_call
-     label="Close All Folders"
-     layout="topleft"
-     name="close_folders">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="close_folders" />
-    </menu_item_call>
-    <menu_item_separator
-     layout="topleft" />
-    <menu_item_call
-     label="Empty Lost and Found"
-     layout="topleft"
-     name="empty_lostnfound">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="empty_lostnfound" />
-        <on_enable
-         function="Inventory.GearDefault.Enable"
-         parameter="empty_lostnfound" />
-    </menu_item_call>
-    <menu_item_separator
-     layout="topleft" />
     <menu_item_call 
          label="Save Texture As"
          layout="topleft"
@@ -156,7 +105,17 @@
         </menu_item_call>
     <menu_item_separator
      layout="topleft" />
-
+    <menu_item_call
+     label="Empty Lost and Found"
+     layout="topleft"
+     name="empty_lostnfound">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="empty_lostnfound" />
+        <on_enable
+         function="Inventory.GearDefault.Enable"
+         parameter="empty_lostnfound" />
+    </menu_item_call>
     <menu_item_call
      label="Empty Trash"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml b/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml
index 46193f4a7a..8e34f52f3a 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml
@@ -6,6 +6,17 @@
  mouse_opaque="false"
  name="menu_search_visibility"
  visible="false">
+  <menu_item_check
+   label="Search outfit folders"
+   layout="topleft"
+   name="search_outfits">
+    <on_click
+     function="Inventory.GearDefault.Custom.Action"
+     parameter="toggle_search_outfits" />
+    <on_check
+     function="Inventory.GearDefault.Check"
+     parameter="toggle_search_outfits" />
+  </menu_item_check>
   <menu_item_check
    label="Search Trash"
    layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
new file mode 100644
index 0000000000..6e3cfd9cee
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ bottom="806"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="menu_view_default"
+ visible="false">
+    <menu_item_check
+     label="Sort by Name"
+     layout="topleft"
+     name="sort_by_name">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="sort_by_name" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="sort_by_name" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort by Most Recent"
+     layout="topleft"
+     name="sort_by_recent">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="sort_by_recent" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="sort_by_recent" />         
+    </menu_item_check>
+    <menu_item_check
+     label="Sort Folders Always by Name"
+     layout="topleft"
+     name="sort_folders_by_name">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="sort_folders_by_name" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="sort_folders_by_name" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort System Folders to Top"
+     layout="topleft"
+     name="sort_system_folders_to_top">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="sort_system_folders_to_top" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="sort_system_folders_to_top" />
+    </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 2ff58035ed..d437f98e91 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -7,7 +7,7 @@
  min_height="300"
  min_width="240"
  name="main inventory panel"
- width="330">
+ width="355">
   <panel.string
    name="Itemcount">
   </panel.string>
@@ -41,11 +41,11 @@
   <combo_box
    height="23"
    layout="topleft"
-   left="10"
+   left="3"
    top="18"
    name="search_type"
    follows="top|left"
-   width="88">
+   width="67">
     <item
      label="Name"
      name="Name"
@@ -69,7 +69,7 @@
    height="23"
    image_overlay="Inv_Toolbar_SearchVisibility"
    layout="topleft"
-   left_pad="3"
+   left_pad="1"
    name="options_visibility_btn"
    width="31" />
   <filter_editor
@@ -78,15 +78,64 @@
    height="23"
    label="Enter search text"
    layout="topleft"
-   left_pad="3"
+   left_pad="1"
    max_length_chars="300"
    highlight_text_field="true"
    name="inventory search editor"
-   width="177" />
+   width="99" />
+  <menu_button
+   follows="top|right"
+   tool_tip="Show additional options"
+   height="23"
+   image_hover_unselected="Toolbar_Middle_Over"
+   image_overlay="OptionsMenu_Off"
+   image_selected="Toolbar_Middle_Selected"
+   image_unselected="Toolbar_Middle_Off"
+   layout="topleft"
+   left_pad="1"
+   name="options_gear_btn"
+   width="31" />
+  <menu_button
+   follows="top|right"
+   tool_tip="View/sort options"
+   height="23"
+   image_hover_unselected="Toolbar_Middle_Over"
+   image_overlay="Conv_toolbar_sort"
+   image_selected="Toolbar_Middle_Selected"
+   image_unselected="Toolbar_Middle_Off"
+   layout="topleft"
+   left_pad="1"
+   name="view_btn"
+   width="31" />
+  <button
+   follows="top|right"
+   height="23"
+   image_hover_unselected="Toolbar_Middle_Over"
+   image_overlay="AddItem_Off"
+   image_selected="Toolbar_Middle_Selected"
+   image_unselected="Toolbar_Middle_Off"
+   layout="topleft"
+   left_pad="1"
+   name="add_btn"
+   tool_tip="Add new item"
+   width="31" />
+  <button
+   follows="top|right"
+   tool_tip="Toggles between traditional and single-folder views"
+   height="23"
+   image_hover_unselected="Toolbar_Middle_Over"
+   image_overlay="Command_Map_Icon"
+   image_selected="Toolbar_Middle_Selected"
+   image_unselected="Toolbar_Middle_Off"
+   layout="topleft"
+   left_pad="1"
+   enabled="false"
+   name="view_mode_btn"
+   width="31" />
   <tab_container
      follows="all"
      halign="center"
-     height="339"
+     height="372"
      layout="topleft"
      left="7"
      name="inventory filter tabs"
@@ -142,92 +191,4 @@
       scroll.reserve_scroll_corner="false">
   </inventory_panel>
   </tab_container>
-  <layout_stack
-   animate="false"
-   border_size="0"
-   follows="left|right|bottom"
-   height="25"
-   layout="topleft"
-   orientation="horizontal"
-   top_pad="0"
-   left="10"
-   name="bottom_panel"
-   width="307">
-      <layout_panel
-       auto_resize="false"
-       height="25"
-       layout="topleft"
-       name="options_gear_btn_panel"
-       width="32">
-          <menu_button
-           follows="bottom|left"
-           tool_tip="Show additional options"
-           height="25"
-           image_hover_unselected="Toolbar_Left_Over"
-           image_overlay="OptionsMenu_Off"
-           image_selected="Toolbar_Left_Selected"
-           image_unselected="Toolbar_Left_Off"
-           layout="topleft"
-           left="0"
-           name="options_gear_btn"
-           top="0"
-           width="31" />
-      </layout_panel>
-      <layout_panel
-       auto_resize="false"
-       height="25"
-       layout="topleft"
-       name="add_btn_panel"
-       width="32">
-          <button
-           follows="bottom|left"
-           height="25"
-           image_hover_unselected="Toolbar_Middle_Over"
-           image_overlay="AddItem_Off"
-           image_selected="Toolbar_Middle_Selected"
-           image_unselected="Toolbar_Middle_Off"
-           layout="topleft"
-           left="0"
-           name="add_btn"
-           tool_tip="Add new item"
-           top="0"
-           width="31" />
-      </layout_panel>
-      <layout_panel
-       auto_resize="true"
-       height="25"
-       layout="topleft"
-       name="dummy_panel"
-       width="212">
-          <icon
-           follows="bottom|left|right"
-           height="25"
-           image_name="Toolbar_Middle_Off"
-           layout="topleft"
-           left="0"
-           top="0"
-           name="dummy_icon"
-           width="211" />
-      </layout_panel>
-      <layout_panel
-       auto_resize="false"
-       height="25"
-       layout="topleft"
-       name="trash_btn_panel"
-       width="31">
-          <dnd_button
-           follows="bottom|left"
-           height="25"
-           image_hover_unselected="Toolbar_Right_Over"
-           image_overlay="TrashItem_Off"
-           image_selected="Toolbar_Right_Selected"
-           image_unselected="Toolbar_Right_Off"
-           left="0"
-           layout="topleft"
-           name="trash_btn"
-           tool_tip="Remove selected item"
-           top="0"
-           width="31"/>
-      </layout_panel>
-  </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 9995523e61..bf50b1adfd 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -7,7 +7,7 @@
 	  min_height="350"
 	  min_width="240"
 	  name="objects panel"
-	  width="333">
+	  width="358">
     <panel
 		 follows="all"
 		 layout="topleft"
@@ -18,7 +18,7 @@
 		 height="570"
 		 visible="true"
 		 default_tab_group="1"
-		 width="330">
+		 width="355">
       <layout_stack
               follows="left|right|top|bottom"
               layout="topleft"
@@ -27,15 +27,15 @@
 							tab_group="1"
               orientation="vertical"
               name="inventory_layout_stack"
-              height="535"
-              width="330">
+              height="565"
+              width="355">
              <layout_panel
                  name="main_inventory_layout_panel"
                  layout="topleft"
                  auto_resize="true"
                  user_resize="true"
                  min_dim="150"
-                 width="330"
+                 width="355"
                  follows="bottom|left|right"
                  height="300">
                  <panel
@@ -48,10 +48,10 @@
                       top="0"
                       label=""
                       height="300"
-                      width="330" />
+                      width="355" />
              </layout_panel>
 			    <layout_panel
-                 width="330"
+                 width="355"
                  layout="topleft"
                  auto_resize="false"
                  user_resize="true"
@@ -133,117 +133,6 @@ Purchases from the marketplace will be delivered here.
                  </panel>
              </layout_panel>
          </layout_stack>
-			<panel follows="bottom|left|right"
-					 height="30"
-					 layout="topleft"
-					 name="button_panel"
-					 left="9"
-					 top_pad="7"
-					 width="308">
-				<layout_stack follows="bottom|left|right"
-											height="23"
-											layout="topleft"
-											mouse_opaque="false"
-											name="button_panel_ls"
-											left="0"
-											orientation="horizontal"
-											top="0"
-											width="308">	
-			    <layout_panel follows="bottom|left|right"
-												height="23"
-												layout="bottomleft"
-												left="0"			
-												mouse_opaque="false"
-												name="info_btn_lp"
-												auto_resize="true"
-												width="101">
-						<button enabled="true"
-										follows="bottom|left|right"
-										height="23"
-										label="Profile"
-										layout="topleft"
-										left="1"
-										name="info_btn"
-										tool_tip="Show object profile"
-										top="0"
-										width="100" />
-			    </layout_panel>
-			    <layout_panel
-                     follows="bottom|left|right"
-                     height="23"
-                     layout="bottomleft"
-                     left_pad="1"			
-                     mouse_opaque="false"
-                     name="share_btn_lp"
-                     auto_resize="true"
-                     width="100">
-                    <button
-                         enabled="true"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Share"
-                         layout="topleft"
-                         left="1"
-                         name="share_btn"
-                         tool_tip="Share an inventory item"
-                         top="0"
-                         width="99" />
-			    </layout_panel>
-			    <layout_panel
-                     follows="bottom|left|right"
-                     height="23"
-                     layout="bottomleft"
-                     left_pad="1"			
-                     mouse_opaque="false"
-                     name="shop_btn_lp"
-                     auto_resize="true"
-                     width="100">
-                    <button
-                         enabled="true"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Shop"
-                         layout="topleft"
-                         left="1"
-                         name="shop_btn"
-                         tool_tip="Open Marketplace webpage"
-                         top="0"
-                         width="99" />
-                    <button
-                         enabled="false"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Wear"
-                         layout="topleft"
-                         left="1"
-                         name="wear_btn"
-                         tool_tip="Wear seleceted outfit"
-                         top="0"
-                         width="99" />
-                    <button
-                         enabled="false"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Play"
-                         layout="topleft"
-                         name="play_btn"
-                         left="1"
-                         top="0"
-                         width="99" />
-                    <button
-                         enabled="false"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Teleport"
-                         layout="topleft"
-                         left="1"
-                         name="teleport_btn"
-                         tool_tip="Teleport to the selected area"
-                         top="0"
-                         width="99" />
-			    </layout_panel>
-			</layout_stack>
-		</panel>
 	</panel>
 	<panel
 		 follows="all"
-- 
cgit v1.2.3


From db80fdb55b646164a71c58e9f4751b368afa3b9f Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 1 Feb 2023 23:56:42 +0200
Subject: SL-19104 update label and permissions display

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index cf5d98aa9a..a3dfb9a618 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2395,8 +2395,11 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="no_modify"   value=" (no modify)" />
 	<string name="no_copy"     value=" (no copy)" />
 	<string name="worn"        value=" (worn)" />
-	<string name="link"        value=" (link)" />
-	<string name="broken_link" value=" (broken_link)" />
+	<string name="link"        value="  link" />
+	<string name="broken_link" value="  broken_link" />
+    <string name="no_transfer_lbl" value=" no transfer" />
+    <string name="no_modify_lbl"   value=" no modify" />
+    <string name="no_copy_lbl"     value=" no copy" />
 	<string name="LoadingContents">Loading contents...</string>
 	<string name="NoContents">No contents</string>
 	<string name="WornOnAttachmentPoint" value=" (worn on [ATTACHMENT_POINT])" />
-- 
cgit v1.2.3


From c5fcf3066f4a5c75635c774422ff1db59b8624f7 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 4 Nov 2022 18:18:46 +0200
Subject: SL-7277 show Advanced permissions in Item profile that was opened
 from inventory

---
 .../skins/default/xui/en/sidepanel_item_info.xml   | 68 +++++++++++++++++++++-
 1 file changed, 66 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 9a68479d05..ff7ea08251 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -461,8 +461,72 @@
         max_val="999999999"
         top_pad="10"
         tool_tip="Object cost." />
-    </panel>
-
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left="10"
+        name="BaseMaskDebug"
+        text_color="White"
+        top_pad="30"
+        width="130">
+        B:
+      </text>
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left_delta="60"
+        name="OwnerMaskDebug"
+        text_color="White"
+        top_delta="0"
+        width="270">
+        O:
+      </text>
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left_delta="60"
+        name="GroupMaskDebug"
+        text_color="White"
+        top_delta="0"
+        width="210">
+        G:
+      </text>
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left_delta="60"
+        name="EveryoneMaskDebug"
+        text_color="White"
+        top_delta="0"
+        width="150">
+        E:
+      </text>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="10"
+       layout="topleft"
+       left_delta="60"
+       name="NextMaskDebug"
+       text_color="White"
+       top_delta="0"
+       width="90">
+        N:
+      </text>
+    </panel>   
   </scroll_container>
   <panel
     height="30"
-- 
cgit v1.2.3


From c9ba8f1fce4665f19ec9485c5ceb5bfa7f290321 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 3 Feb 2023 23:56:35 +0200
Subject: SL-19109 Decouple object profiles from inventory

Potentially this won't stay as sidepanels, but such rework is planned for SL-19134, for now just making it possible to open multiple instances of item profiles
---
 .../default/xui/en/floater_item_properties.xml     |  2 +-
 .../default/xui/en/floater_task_properties.xml     | 24 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_task_properties.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_item_properties.xml b/indra/newview/skins/default/xui/en/floater_item_properties.xml
index 0fc54a9c8b..336bb902ca 100644
--- a/indra/newview/skins/default/xui/en/floater_item_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_item_properties.xml
@@ -13,7 +13,7 @@
    left="0"
    class="sidepanel_item_info"
    filename="sidepanel_item_info.xml"
-   name="item_panel"
+   name="sidepanel"
    top="20"
    label=""
    height="570"
diff --git a/indra/newview/skins/default/xui/en/floater_task_properties.xml b/indra/newview/skins/default/xui/en/floater_task_properties.xml
new file mode 100644
index 0000000000..4b5c207577
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_task_properties.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="570"
+ layout="topleft"
+ name="Task Properties"
+ help_topic="item+properties"
+ title="ITEM PROPERTIES"
+ single_instance="true"
+ width="330">
+ <panel
+   follows="all"
+   layout="topleft"
+   left="0"
+   class="sidepanel_task_info"
+   filename="sidepanel_task_info.xml"
+   name="sidepanel"
+   top="20"
+   label=""
+   height="550"
+   visible="true"
+   width="330">
+ </panel>
+</floater>
-- 
cgit v1.2.3


From 13a65319e0648cf228a82950e96a84d3a69bf6e3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 4 Feb 2023 19:23:45 +0200
Subject: SL-19109 Turn LLSidepanelItemInfo into a normal panel

---
 .../skins/default/xui/en/sidepanel_item_info.xml   | 32 +---------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index ff7ea08251..813294cf83 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -53,25 +53,12 @@
     name="IconLocked"
     top="8"
     width="18" />
-  <button
-    follows="top|left"
-    height="24"
-    image_hover_unselected="BackButton_Over"
-    image_pressed="BackButton_Press"
-    image_unselected="BackButton_Off"
-    layout="topleft"
-    left="12"
-    name="back_btn"
-    tab_stop="false"
-    top="2"
-    width="30"
-    use_draw_context_alpha="false" />
   <text
     follows="top|left|right"
     font="SansSerifHugeBold"
     height="26"
     layout="topleft"
-    left_pad="3"
+    left="45"
     name="title"
     text_color="LtGray"
     top="2"
@@ -528,21 +515,4 @@
       </text>
     </panel>   
   </scroll_container>
-  <panel
-    height="30"
-    layout="topleft"
-    name="button_panel"
-    left="5"
-    top_pad="0"
-    width="313"
-    follows="top|right|left">
-    <button
-      follows="top|right"
-      height="23"
-      label="Cancel"
-      layout="topleft"
-      name="cancel_btn"
-      right="-1"
-      width="100" />
-  </panel>
 </panel>
-- 
cgit v1.2.3


From 7a99ce16d1a505a5c65722245dc6e4fc9ea9330d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 4 Feb 2023 19:29:35 +0200
Subject: SL-19109 Turn LLSidepanelTaskInfo into a normal panel

---
 .../skins/default/xui/en/sidepanel_task_info.xml        | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 1c9d750aa6..8f7a62fb8a 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -62,25 +62,12 @@
              name="Sale Mixed">
                 Mixed Sale
             </panel.string>
-    <button
-     follows="top|left"
-     height="24"
-     image_hover_unselected="BackButton_Over"
-     image_pressed="BackButton_Press"
-     image_unselected="BackButton_Off"
-     layout="topleft"
-     left="8"
-     name="back_btn"
-     tab_stop="false"
-     top="0"
-     width="30"
-     use_draw_context_alpha="false" />
-        <text
+    <text
      follows="top|left|right"
      font="SansSerifHuge"
      height="26"
      layout="topleft"
-     left_pad="10"
+     left="48"
      name="title"
      text_color="LtGray"
      top="0"
-- 
cgit v1.2.3


From a654989812853484733c1d03af98f64821323a7a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 7 Feb 2023 00:11:46 +0200
Subject: SL-19134 Replace icon in profiles with thumbnail

Mostly to make sure it works, but avatar images can be fairly large, so this prevents them from being permanently stored
---
 indra/newview/skins/default/xui/en/panel_profile_firstlife.xml  | 2 +-
 indra/newview/skins/default/xui/en/panel_profile_secondlife.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index ca1e405a62..f899f83ad4 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -19,7 +19,7 @@
      layout="topleft"
      visible="false"
     />
-    <icon
+    <thumbnail
      name="real_world_pic"
      image_name="Generic_Person_Large"
      follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 777b37d666..ebedbf20c7 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -48,7 +48,7 @@ Account: [ACCTTYPE]
      auto_resize="false"
      user_resize="false">
 
-      <icon
+      <thumbnail
        name="2nd_life_pic"
        image_name="Generic_Person_Large"
        layout="topleft"
-- 
cgit v1.2.3


From c97de5ac48c21ba7014ad2258a670db8810fdf5c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 6 Feb 2023 19:34:04 +0200
Subject: SL-19134 [WIP] Item Profile redesign #3

---
 .../skins/default/xui/en/sidepanel_item_info.xml   | 677 ++++++++++-----------
 1 file changed, 334 insertions(+), 343 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 813294cf83..5f1c9e74bf 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -43,201 +43,121 @@
     name="origin_inworld">
     (Inworld)
   </panel.string>
-  <icon
-    follows="top|right"
-    height="18"
-    image_name="Lock"
-    layout="topleft"
-    right="-15"
-    mouse_opaque="true"
-    name="IconLocked"
-    top="8"
-    width="18" />
-  <text
-    follows="top|left|right"
-    font="SansSerifHugeBold"
-    height="26"
-    layout="topleft"
-    left="45"
-    name="title"
-    text_color="LtGray"
-    top="2"
-    use_ellipses="true"
-    value="Item Profile"
-    width="275" />
-  <text
-    follows="top|left|right"
-    height="13"
-    layout="topleft"
-    left="45"
-    name="origin"
-    text_color="LtGray_50"
-    use_ellipses="true"
-    value="(Inventory)"
-    width="275" />
-  <scroll_container
-    color="DkGray2"
-    follows="all"
-    layout="topleft"
-    left="9"
-    name="item_profile_scroll"
-    opaque="true"
-    height="493"
-    width="313"
-    top="45">
-    <panel
-      follows="left|top|right"
-      height="390"
-      help_topic=""
-      label=""
+
+<layout_stack
+  animate="false"
+  name="main_stack"
+  layout="topleft"
+  follows="all"
+  orientation="vertical"
+  left="0"
+  top="0"
+  right="-1"
+  bottom="-1">
+    <layout_panel
+      auto_resize="false"
+      name="layout_item_name"
       layout="topleft"
-      left="0"
-      name="item_profile"
-      top="0"
-      width="295">
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
-        layout="topleft"
-        left="5"
-        name="LabelItemNameTitle"
-        top="10"
-        width="78">
-        Name:
-      </text>
+      follows="all"
+      height="35">
       <line_editor
         border_style="line"
         border_thickness="1"
         follows="left|top|right"
-        height="20"
         layout="topleft"
-        left_delta="78"
+        left="5"
+        top="0"
+        right="-25"
+        height="20"
         max_length_bytes="63"
         name="LabelItemName"
-        top_delta="0"
-        width="210"
         tool_tip="The name is limited to 63 characters. Longer prim names are cut short. Names can only consist of printable characters found in the ASCII-7 (non-extended) character set, with the exception of the vertical bar/pipe &apos;|&apos;." />
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
+      <icon
+        follows="top|right"
+        height="18"
+        image_name="Lock"
         layout="topleft"
-        left="5"
-        name="LabelItemDescTitle"
-        top_pad="10"
-        width="78">
-        Description:
-      </text>
-      <line_editor
-        border_style="line"
-        border_thickness="1"
-        follows="left|top|right"
-        height="23"
+        right="-5"
+        mouse_opaque="true"
+        name="IconLocked"
+        top="2"
+        width="18" />
+    </layout_panel>
+    
+    <layout_panel
+      auto_resize="false"
+      name="layout_item_details"
+      layout="topleft"
+      follows="all"
+      height="130">
+      
+      <thumbnail
+        name="item_thumbnail"
+        follows="top|left"
         layout="topleft"
-        left_delta="78"
-        max_length_bytes="127"
-        name="LabelItemDesc"
-        top_delta="-5"
-        width="210"
-        tool_tip="When people have &apos;Hover Tips on All Objects&apos; selected in the viewer's settings, they'll see the object description pop-up for any object under their mouse pointer. The prim description is limited to 127 bytes any string longer then that will be truncated." />
+        left="5"
+        top="0"
+        height="128"
+        width="128"
+        />
+        
       <text
         type="string"
         length="1"
         follows="left|top"
         height="23"
         layout="topleft"
-        left="5"
-        name="LabelCreatorTitle"
-        top_pad="10"
+        left_pad="5"
+        name="LabelOwnerTitle"
+        top="0"
         width="78">
-        Creator:
+        Owner:
       </text>
-      <avatar_icon
-        follows="top|left"
-        height="20"
-        default_icon_name="Generic_Person"
-        layout="topleft"
-        left_pad="0"
-        top_delta="-6"
-        mouse_opaque="true"
-        width="20" />
       <text
         type="string"
         follows="left|right|top"
         font="SansSerifSmall"
         height="15"
         layout="topleft"
-        left_pad="5"
-        name="LabelCreatorName"
-        top_delta="6"
+        left_delta="0"
+        name="LabelOwnerName"
+        top_pad="2"
         use_ellipses="true"
         width="165">
       </text>
-      <button
-        follows="top|right"
-        height="16"
-        image_selected="Inspector_I"
-        image_unselected="Inspector_I"
-        layout="topleft"
-        right="-5"
-        name="BtnCreator"
-        top_delta="-6"
-        width="16" />
       <text
         type="string"
         length="1"
         follows="left|top"
         height="23"
         layout="topleft"
-        left="5"
-        name="LabelOwnerTitle"
-        top_pad="10"
+        left_delta="0"
+        name="LabelCreatorTitle"
+        top_pad="2"
         width="78">
-        Owner:
+        Creator:
       </text>
-      <avatar_icon
-        follows="top|left"
-        height="20"
-        default_icon_name="Generic_Person"
-        layout="topleft"
-        left_pad="0"
-        top_delta="-6"
-        mouse_opaque="true"
-        width="20" />
       <text
         type="string"
         follows="left|right|top"
         font="SansSerifSmall"
         height="15"
         layout="topleft"
-        left_pad="5"
-        name="LabelOwnerName"
-        top_delta="6"
+        left_delta="0"
+        name="LabelCreatorName"
+        top_pad="2"
         use_ellipses="true"
         width="165">
       </text>
-      <button
-        follows="top|right"
-        height="16"
-        image_selected="Inspector_I"
-        image_unselected="Inspector_I"
-        layout="topleft"
-        right="-5"
-        name="BtnOwner"
-        top_delta="-3"
-        width="16" />
       <text
         type="string"
         length="1"
         follows="left|top"
         height="23"
         layout="topleft"
-        left="5"
+        left_delta="0"
         name="LabelAcquiredTitle"
-        top_pad="10"
+        top_pad="2"
         width="78">
         Acquired:
       </text>
@@ -247,11 +167,19 @@
         follows="left|top|right"
         height="23"
         layout="topleft"
-        left_delta="78"
+        left_delta="0"
         name="LabelAcquiredDate"
-        top_delta="0"
+        top_pad="2"
         width="210">
       </text>
+    </layout_panel>
+    
+    <layout_panel
+      auto_resize="false"
+      name="layout_item_description"
+      layout="topleft"
+      follows="all"
+      height="54">
       <text
         type="string"
         length="1"
@@ -259,150 +187,204 @@
         height="10"
         layout="topleft"
         left="5"
-        name="LabelItemExperienceTitle"
-        top_pad="0"
-        width="78"
-        visible="true">
-        Experience:
+        name="LabelItemDescTitle"
+        top="0"
+        width="78">
+        Description:
       </text>
-      <text
-        type="string"
-        length="1"
-        follows="left|top|right"
-        height="10"
-        layout="topleft"
-        left_delta="78"
-        name="LabelItemExperience"
-        top_delta="0"
-        width="210"
-        visible="true"
-        />
-      <panel
-        border="false"
+      <line_editor
+        border_style="line"
+        border_thickness="1"
         follows="left|top|right"
         layout="topleft"
-        mouse_opaque="false"
-        name="perms_inv"
-        left="0"
-        top_pad="25"
-        height="155"
-        width="313">
-        <text
-          type="string"
-          length="1"
-          left="10"
-          top_pad="13"
-          text_color="EmphasisColor"
-          height="15"
-          follows="left|top|right"
-          layout="topleft"
-          name="perm_modify"
-          width="200">
-          You can:
-        </text>
-        <check_box
-          height="18"
-          label="Modify"
-          layout="topleft"
-          left="20"
-          name="CheckOwnerModify"
-          top_pad="0"
-          width="90" />
-        <check_box
-          height="18"
-          label="Copy"
-          layout="topleft"
-          left_pad="0"
-          name="CheckOwnerCopy"
-          width="90" />
-        <check_box
-          height="18"
-          label="Transfer"
-          layout="topleft"
-          left_pad="0"
-          name="CheckOwnerTransfer"
-          width="106" />
-        <text
-          type="string"
-          length="1"
-          follows="left|top"
-          height="16"
-          layout="topleft"
-          left="10"
-          name="AnyoneLabel"
-          top_pad="8"
-          width="100">
-          Anyone:
-        </text>
-        <check_box
-          height="18"
-          label="Copy"
-          layout="topleft"
-          left_pad="0"
-          name="CheckEveryoneCopy"
-          tool_tip="Anyone can take a copy of the object . Object and all of its contents must be copy and transfer permissive."
-          top_delta="-2"
-          width="150" />
+        left="5"
+        top_pad="5"
+        right="-5"
+        height="23"
+        max_length_bytes="127"
+        name="LabelItemDesc"
+        tool_tip="When people have &apos;Hover Tips on All Objects&apos; selected in the viewer's settings, they'll see the object description pop-up for any object under their mouse pointer. The prim description is limited to 127 bytes any string longer then that will be truncated." />
+        
         <text
           type="string"
           length="1"
           follows="left|top"
-          height="16"
+          height="10"
           layout="topleft"
-          left="10"
-          name="GroupLabel"
-          top_pad="8"
-          width="100">
-          Group:
+          left="5"
+          name="LabelItemExperienceTitle"
+          top_pad="0"
+          width="78"
+          visible="true">
+          Experience:
         </text>
-        <check_box
-          height="18"
-          label="Share"
-          layout="topleft"
-          left_pad="0"
-          top_delta="-2"
-          name="CheckShareWithGroup"
-          tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
-          width="150" />
         <text
           type="string"
           length="1"
-          follows="left|top"
-          height="16"
-          layout="topleft"
-          left="10"
-          name="NextOwnerLabel"
-          top_pad="8"
-          width="200"
-          word_wrap="true">
-          Next owner:
-        </text>
-        <check_box
-          height="18"
-          label="Modify"
-          layout="topleft"
-          left="20"
-          top_pad="0"
-          name="CheckNextOwnerModify"
-          tool_tip="Next owner can edit properties like item name or scale of this object."
-          width="90" />
-        <check_box
-          height="18"
-          label="Copy"
-          layout="topleft"
-          left_pad="0"
-          name="CheckNextOwnerCopy"
-          tool_tip="Next owner can make unlimited copies of this object. Copies maintain creator information, and can never be more permissive than the item being copied."
-          width="90" />
-        <check_box
-          height="18"
-          label="Transfer"
+          follows="left|top|right"
+          height="10"
           layout="topleft"
-          left_pad="0"
-          name="CheckNextOwnerTransfer"
-          tool_tip="Next owner can give away or resell this object."
-          width="106" />
-      </panel>
+          left_delta="78"
+          name="LabelItemExperience"
+          top_delta="0"
+          width="210"
+          visible="true"
+          />
+    </layout_panel>
+    
+    <layout_panel
+      auto_resize="false"
+      name="layout_item_permissions_sale"
+      layout="topleft"
+      follows="all"
+      height="300">
+      
+      <view_border
+        bevel_style="none"
+        height="0"
+        layout="topleft"
+        left="0"
+        right="-1"
+        name="cost_text_border"
+        top="1"/>
+        
+      <text
+        type="string"
+        length="1"
+        left="10"
+        top_pad="5"
+        height="15"
+        follows="left|top|right"
+        layout="topleft"
+        name="perm_modify"
+        width="200">
+        Permissions
+      </text>
+
+      <text
+        type="string"
+        length="1"
+        left="10"
+        top_pad="5"
+        height="15"
+        follows="left|top|right"
+        layout="topleft"
+        name="perm_modify"
+        width="200">
+        You can:
+      </text>
+      <check_box
+        height="18"
+        label="Modify"
+        layout="topleft"
+        left="20"
+        name="CheckOwnerModify"
+        top_pad="0"
+        width="90" />
+      <check_box
+        height="18"
+        label="Copy"
+        layout="topleft"
+        left_pad="0"
+        name="CheckOwnerCopy"
+        width="90" />
+      <check_box
+        height="18"
+        label="Transfer"
+        layout="topleft"
+        left_pad="0"
+        name="CheckOwnerTransfer"
+        width="106" />
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        left="10"
+        name="AnyoneLabel"
+        top_pad="8"
+        width="100">
+        Anyone:
+      </text>
+      <check_box
+        height="18"
+        label="Copy"
+        layout="topleft"
+        left_pad="0"
+        name="CheckEveryoneCopy"
+        tool_tip="Anyone can take a copy of the object . Object and all of its contents must be copy and transfer permissive."
+        top_delta="-2"
+        width="150" />
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        left="10"
+        name="GroupLabel"
+        top_pad="8"
+        width="100">
+        Group:
+      </text>
+      <check_box
+        height="18"
+        label="Share"
+        layout="topleft"
+        left_pad="0"
+        top_delta="-2"
+        name="CheckShareWithGroup"
+        tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
+        width="150" />
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        left="10"
+        name="NextOwnerLabel"
+        top_pad="8"
+        width="200"
+        word_wrap="true">
+        Next owner:
+      </text>
+      <check_box
+        height="18"
+        label="Modify"
+        layout="topleft"
+        left="20"
+        top_pad="0"
+        name="CheckNextOwnerModify"
+        tool_tip="Next owner can edit properties like item name or scale of this object."
+        width="90" />
+      <check_box
+        height="18"
+        label="Copy"
+        layout="topleft"
+        left_pad="0"
+        name="CheckNextOwnerCopy"
+        tool_tip="Next owner can make unlimited copies of this object. Copies maintain creator information, and can never be more permissive than the item being copied."
+        width="90" />
+      <check_box
+        height="18"
+        label="Transfer"
+        layout="topleft"
+        left_pad="0"
+        name="CheckNextOwnerTransfer"
+        tool_tip="Next owner can give away or resell this object."
+        width="106" />
+        
+    <view_border
+        bevel_style="none"
+        height="0"
+        layout="topleft"
+        left="0"
+        right="-1"
+        name="cost_text_border"
+        top_pad="7"/>
+        
       <check_box
         height="18"
         label="For Sale"
@@ -448,71 +430,80 @@
         max_val="999999999"
         top_pad="10"
         tool_tip="Object cost." />
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
-        layout="topleft"
-        left="10"
-        name="BaseMaskDebug"
-        text_color="White"
-        top_pad="30"
-        width="130">
-        B:
-      </text>
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
-        layout="topleft"
-        left_delta="60"
-        name="OwnerMaskDebug"
-        text_color="White"
-        top_delta="0"
-        width="270">
-        O:
-      </text>
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
-        layout="topleft"
-        left_delta="60"
-        name="GroupMaskDebug"
-        text_color="White"
-        top_delta="0"
-        width="210">
-        G:
-      </text>
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
-        layout="topleft"
-        left_delta="60"
-        name="EveryoneMaskDebug"
-        text_color="White"
-        top_delta="0"
-        width="150">
-        E:
-      </text>
-      <text
-       type="string"
-       length="1"
-       follows="left|top"
-       height="10"
-       layout="topleft"
-       left_delta="60"
-       name="NextMaskDebug"
-       text_color="White"
-       top_delta="0"
-       width="90">
-        N:
-      </text>
-    </panel>   
-  </scroll_container>
+      
+    </layout_panel>
+
+    <layout_panel
+     auto_resize="false"
+     name="layout_debug_permissions"
+     layout="topleft"
+     follows="all"
+     height="30">
+        <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="10"
+          layout="topleft"
+          left="10"
+          name="BaseMaskDebug"
+          text_color="White"
+          top="2"
+          width="130">
+          B:
+        </text>
+        <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="10"
+          layout="topleft"
+          left_delta="60"
+          name="OwnerMaskDebug"
+          text_color="White"
+          top_delta="0"
+          width="270">
+          O:
+        </text>
+        <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="10"
+          layout="topleft"
+          left_delta="60"
+          name="GroupMaskDebug"
+          text_color="White"
+          top_delta="0"
+          width="210">
+          G:
+        </text>
+        <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="10"
+          layout="topleft"
+          left_delta="60"
+          name="EveryoneMaskDebug"
+          text_color="White"
+          top_delta="0"
+          width="150">
+          E:
+        </text>
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="10"
+         layout="topleft"
+         left_delta="60"
+         name="NextMaskDebug"
+         text_color="White"
+         top_delta="0"
+         width="90">
+          N:
+        </text>
+    </layout_panel>
+  </layout_stack>
 </panel>
-- 
cgit v1.2.3


From 97d58e6184756c25d905cd05ab3073d7560a05ab Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 7 Feb 2023 21:55:18 +0200
Subject: SL-19134 Item Profile redesign #4

---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 26 ---------
 .../skins/default/xui/en/sidepanel_item_info.xml   | 64 ++++++++++++----------
 .../skins/default/xui/en/sidepanel_task_info.xml   |  1 -
 3 files changed, 34 insertions(+), 57 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index bf50b1adfd..82eb629670 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -134,30 +134,4 @@ Purchases from the marketplace will be delivered here.
              </layout_panel>
          </layout_stack>
 	</panel>
-	<panel
-		 follows="all"
-		 layout="topleft"
-		 left="0"
-		 class="sidepanel_item_info"
-		 filename="sidepanel_item_info.xml"
-		 name="sidepanel__item_panel"
-		 top="0"
-		 label=""
-		 height="570"
-		 visible="false"
-		 width="330">
-	</panel>
-	<panel
-		 follows="all"
-		 layout="topleft"
-		 left="0"
-		 class="sidepanel_task_info"
-		 filename="sidepanel_task_info.xml"
-		 name="sidepanel__task_panel"
-		 top="0"
-		 label=""
-		 height="570"
-		 visible="false"
-		 width="330">
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 5f1c9e74bf..320c20deb6 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -59,14 +59,14 @@
       name="layout_item_name"
       layout="topleft"
       follows="all"
-      height="35">
+      height="25">
       <line_editor
         border_style="line"
         border_thickness="1"
         follows="left|top|right"
         layout="topleft"
         left="5"
-        top="0"
+        top="1"
         right="-25"
         height="20"
         max_length_bytes="63"
@@ -80,7 +80,7 @@
         right="-5"
         mouse_opaque="true"
         name="IconLocked"
-        top="2"
+        top="3"
         width="18" />
     </layout_panel>
     
@@ -105,7 +105,7 @@
         type="string"
         length="1"
         follows="left|top"
-        height="23"
+        height="17"
         layout="topleft"
         left_pad="5"
         name="LabelOwnerTitle"
@@ -115,49 +115,53 @@
       </text>
       <text
         type="string"
-        follows="left|right|top"
         font="SansSerifSmall"
-        height="15"
+        follows="left|right|top"
         layout="topleft"
+        height="15"
+        width="187"
         left_delta="0"
+        top_pad="0"
         name="LabelOwnerName"
-        top_pad="2"
         use_ellipses="true"
-        width="165">
+        translate="false">
+TestString PleaseIgnore
       </text>
       <text
         type="string"
         length="1"
         follows="left|top"
-        height="23"
+        height="17"
         layout="topleft"
         left_delta="0"
         name="LabelCreatorTitle"
-        top_pad="2"
+        top_pad="7"
         width="78">
         Creator:
       </text>
       <text
         type="string"
-        follows="left|right|top"
         font="SansSerifSmall"
-        height="15"
+        follows="left|right|top"
         layout="topleft"
         left_delta="0"
+        top_pad="0"
+        width="187"
+        height="15"
         name="LabelCreatorName"
-        top_pad="2"
         use_ellipses="true"
-        width="165">
+        translate="false">
+TestString PleaseIgnore
       </text>
       <text
         type="string"
         length="1"
         follows="left|top"
-        height="23"
+        height="17"
         layout="topleft"
         left_delta="0"
         name="LabelAcquiredTitle"
-        top_pad="2"
+        top_pad="7"
         width="78">
         Acquired:
       </text>
@@ -169,8 +173,8 @@
         layout="topleft"
         left_delta="0"
         name="LabelAcquiredDate"
-        top_pad="2"
-        width="210">
+        top_pad="0"
+        width="187">
       </text>
     </layout_panel>
     
@@ -179,7 +183,7 @@
       name="layout_item_description"
       layout="topleft"
       follows="all"
-      height="54">
+      height="61">
       <text
         type="string"
         length="1"
@@ -213,7 +217,7 @@
           layout="topleft"
           left="5"
           name="LabelItemExperienceTitle"
-          top_pad="0"
+          top_pad="7"
           width="78"
           visible="true">
           Experience:
@@ -237,14 +241,14 @@
       name="layout_item_permissions_sale"
       layout="topleft"
       follows="all"
-      height="300">
+      height="235">
       
       <view_border
         bevel_style="none"
         height="0"
         layout="topleft"
-        left="0"
-        right="-1"
+        left="5"
+        right="-6"
         name="cost_text_border"
         top="1"/>
         
@@ -252,9 +256,9 @@
         type="string"
         length="1"
         left="10"
-        top_pad="5"
+        top_pad="7"
         height="15"
-        follows="left|top|right"
+        follows="left|top"
         layout="topleft"
         name="perm_modify"
         width="200">
@@ -267,7 +271,7 @@
         left="10"
         top_pad="5"
         height="15"
-        follows="left|top|right"
+        follows="left|top"
         layout="topleft"
         name="perm_modify"
         width="200">
@@ -380,10 +384,10 @@
         bevel_style="none"
         height="0"
         layout="topleft"
-        left="0"
-        right="-1"
+        left="5"
+        right="-6"
         name="cost_text_border"
-        top_pad="7"/>
+        top_pad="9"/>
         
       <check_box
         height="18"
@@ -391,7 +395,7 @@
         layout="topleft"
         left="20"
         name="CheckPurchase"
-        top_pad="20"
+        top_pad="15"
         width="100"
         tool_tip="Lets people buy this object, its content or it copy inworld for specified price." />
       <combo_box
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 8f7a62fb8a..ddabbbe4cf 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -168,7 +168,6 @@
 		     translate="false"
          use_ellipses="true" 
 		     width="225">
-	        TestString PleaseIgnore
 	     </text>
 	    <text
 			 type="string"
-- 
cgit v1.2.3


From 1cc41cb9c4c4dfaa7e385e63dac25ff97c18e63a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 8 Feb 2023 14:02:09 +0200
Subject: SL-19134 Remove llfloaterproperties

Looks like it wasn't used for a while and LLFloaterItemPropertie does the same thing now
---
 .../xui/da/floater_inventory_item_properties.xml   |  67 ----
 .../xui/de/floater_inventory_item_properties.xml   |  36 --
 .../xui/en/floater_inventory_item_properties.xml   | 422 ---------------------
 .../xui/es/floater_inventory_item_properties.xml   |  36 --
 .../xui/fr/floater_inventory_item_properties.xml   |  36 --
 .../xui/it/floater_inventory_item_properties.xml   |  36 --
 .../xui/ja/floater_inventory_item_properties.xml   |  36 --
 .../xui/pl/floater_inventory_item_properties.xml   |  59 ---
 .../xui/pt/floater_inventory_item_properties.xml   |  36 --
 .../xui/ru/floater_inventory_item_properties.xml   |  36 --
 .../xui/tr/floater_inventory_item_properties.xml   |  36 --
 .../xui/zh/floater_inventory_item_properties.xml   |  36 --
 12 files changed, 872 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
deleted file mode 100644
index 59dcc87140..0000000000
--- a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="OPLYSNINGER OM BEHOLDNINGSGENSTAND">
-	<floater.string name="unknown">
-		(ukendt)
-	</floater.string>
-	<floater.string name="public">
-		(offentlig)
-	</floater.string>
-	<floater.string name="you_can">
-		Du kan:
-	</floater.string>
-	<floater.string name="owner_can">
-		Ejer kan:
-	</floater.string>
-	<floater.string name="acquiredDate">
-		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
-	</floater.string>
-	<text name="LabelItemNameTitle">
-		Navn:
-	</text>
-	<text name="LabelItemDescTitle">
-		Beskrivelse:
-	</text>
-	<text name="LabelCreatorTitle">
-		Skaber:
-	</text>
-	<button label="Profil..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">
-		Ejer:
-	</text>
-	<button label="Profil..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">
-		Erhvervet:
-	</text>
-	<text name="LabelAcquiredDate">
-		Wed May 24 12:50:46 2006
-	</text>
-	<text name="OwnerLabel">
-		Dig:
-	</text>
-	<check_box label="Redigér" name="CheckOwnerModify"/>
-	<check_box label="Kopiere" name="CheckOwnerCopy"/>
-	<check_box label="Sælg" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">
-		Enhver:
-	</text>
-	<check_box label="Kopiér" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">
-		Gruppe:
-	</text>
-	<check_box label="Del" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel">
-		Næste ejer:
-	</text>
-	<check_box label="Redigér" name="CheckNextOwnerModify"/>
-	<check_box label="Kopiere" name="CheckNextOwnerCopy"/>
-	<check_box label="Sælg" name="CheckNextOwnerTransfer"/>
-	<check_box label="Til salg" name="CheckPurchase"/>
-	<combo_box name="combobox sale copy">
-		<combo_box.item label="Kopiér" name="Copy"/>
-		<combo_box.item label="Original" name="Original"/>
-	</combo_box>
-	<spinner label="Pris:" name="Edit Cost"/>
-	<text name="CurrencySymbol">
-		L$
-	</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
deleted file mode 100644
index 92c038057f..0000000000
--- a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="EIGENSCHAFTEN: INVENTAROBJEKT">
-	<floater.string name="unknown">(unbekannt)</floater.string>
-	<floater.string name="public">(öffentlich)</floater.string>
-	<floater.string name="you_can">Sie können:</floater.string>
-	<floater.string name="owner_can">Eigentümer kann:</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Name:</text>
-	<text name="LabelItemDescTitle">Beschreibung:</text>
-	<text name="LabelCreatorTitle">Ersteller:</text>
-	<button label="Profil..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">Eigentümer:</text>
-	<button label="Profil..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Erworben:</text>
-	<text name="LabelAcquiredDate">Mittwoch, 24. Mai 2006, 12:50:46</text>
-	<text name="OwnerLabel">Sie:</text>
-	<check_box label="Bearbeiten" name="CheckOwnerModify"/>
-	<check_box label="Kopieren" left_delta="85" name="CheckOwnerCopy"/>
-	<check_box label="Wiederverkaufen" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">Jeder:</text>
-	<check_box label="Kopieren" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">Gruppe:</text>
-	<check_box label="Teilen" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="150">Nächster Eigentümer:</text>
-	<check_box label="Bearbeiten" name="CheckNextOwnerModify"/>
-	<check_box label="Kopieren" left_delta="55" name="CheckNextOwnerCopy"/>
-	<check_box label="Wiederverkaufen" name="CheckNextOwnerTransfer"/>
-	<check_box label="Zum Verkauf" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Kopie" name="Copy"/>
-		<combo_box.item label="Inhalt" name="Contents"/>
-		<combo_box.item label="Original" name="Original"/>
-	</combo_box>
-	<spinner label="Preis:" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
deleted file mode 100644
index 45e16c59ae..0000000000
--- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,422 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="340"
- layout="topleft"
- name="item properties"
- help_topic="item_properties"
- save_rect="true"
- title="INVENTORY ITEM PROPERTIES"
- width="350">
-    <floater.string
-     name="unknown">
-        (unknown)
-    </floater.string>
-    <floater.string
-     name="public">
-        (public)
-    </floater.string>
-    <floater.string
-     name="you_can">
-        You can:
-    </floater.string>
-    <floater.string
-     name="owner_can">
-        Owner can:
-    </floater.string>
-    <floater.string
-     name="acquiredDate">
-        [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
-    </floater.string>
-    <icon
-     follows="top|right"
-     height="18"
-     image_name="Lock"
-     layout="topleft"
-     left="276"
-     mouse_opaque="true"
-     name="IconLocked"
-     top="4"
-     width="18" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="LabelItemNameTitle"
-     top="25"
-     width="78">
-        Name:
-    </text>
-    <line_editor
-     border_style="line"
-     border_thickness="1"
-     follows="left|top|right"
-     height="16"
-     layout="topleft"
-     left_delta="78"
-     max_length_bytes="63"
-     name="LabelItemName"
-     top_delta="0"
-     width="252" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="LabelItemDescTitle"
-     top="45"
-     width="78">
-        Description:
-    </text>
-    <line_editor
-     border_style="line"
-     border_thickness="1"
-     follows="left|top|right"
-     height="16"
-     layout="topleft"
-     left_delta="78"
-     max_length_bytes="127"
-     name="LabelItemDesc"
-     top_delta="0"
-     width="252" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="LabelCreatorTitle"
-     top="65"
-     width="78">
-        Creator:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left_delta="78"
-     name="LabelCreatorName"
-     top_delta="0"
-     translate="false"
-     use_ellipses="true" 
-     width="170">
-        TestString PleaseIgnore
-    </text>
-    <button
-     follows="top|right"
-     height="16"
-     label="Profile..."
-     layout="topleft"
-     left_delta="174"
-     name="BtnCreator"
-     top_delta="0"
-     width="78" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="LabelOwnerTitle"
-     top="85"
-     width="78">
-        Owner:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left_delta="78"
-     name="LabelOwnerName"
-     top_delta="0"
-     translate="false"
-     use_ellipses="true"
-     width="170">
-      TestString PleaseIgnore
-    </text>
-    <button
-     follows="top|right"
-     height="16"
-     label="Profile..."
-     layout="topleft"
-     left_delta="174"
-     name="BtnOwner"
-     top_delta="0"
-     width="78" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="LabelAcquiredTitle"
-     top="105"
-     width="78">
-        Acquired:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left_delta="78"
-     name="LabelAcquiredDate"
-     top_delta="0"
-     width="252">
-        Wed May 24 12:50:46 2006
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="OwnerLabel"
-     top="125"
-     width="78">
-        You:
-    </text>
-    <check_box
-     height="16"
-     label="Edit"
-     layout="topleft"
-     left_pad="5"
-     name="CheckOwnerModify"
-     top_delta="0"
-     width="78" />
-    <check_box
-     height="16"
-     label="Copy"
-     layout="topleft"
-     left_delta="0"
-     name="CheckOwnerCopy"
-     top_pad="5"
-     width="88" />
-    <check_box
-     height="16"
-     label="Resell"
-     layout="topleft"
-     left_delta="0"
-     name="CheckOwnerTransfer"
-     top_pad="5"
-     width="106" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="AnyoneLabel"
-     top_pad="5"
-     width="78">
-        Anyone:
-    </text>
-    <check_box
-     height="16"
-     label="Copy"
-     layout="topleft"
-     left_pad="5"
-     name="CheckEveryoneCopy"
-     top_delta="0"
-     width="130" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="GroupLabel"
-     top_pad="5"
-     width="78">
-        Group:
-    </text>
-    <check_box
-     height="16"
-     label="Share"
-     layout="topleft"
-     left_pad="5"
-     name="CheckShareWithGroup"
-     top_delta="5"
-     width="106" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="25"
-     layout="topleft"
-     left="10"
-     name="NextOwnerLabel"
-     top_pad="5"
-     width="78"
-     word_wrap="true">
-        Next owner:
-    </text>
-    <check_box
-     height="16"
-     label="Edit"
-     layout="topleft"
-     left_pad="5"
-     name="CheckNextOwnerModify"
-     top_delta="0"
-     width="78" />
-    <check_box
-     height="16"
-     label="Copy"
-     layout="topleft"
-     left_delta="0"
-     name="CheckNextOwnerCopy"
-     top_pad="5"
-     width="88" />
-    <check_box
-     height="16"
-     label="Resell"
-     layout="topleft"
-     left_delta="0"
-     name="CheckNextOwnerTransfer"
-     top_pad="5"
-     width="106" />
-    <check_box
-     height="16"
-     label="For Sale"
-     layout="topleft"
-     left="10"
-     name="CheckPurchase"
-     top_pad="5"
-     width="78" />
-     <combo_box
-     height="19"
-     left_pad="5"
-     layout="topleft"
-     follows="left|top"
-     name="ComboBoxSaleType"
-     width="110">
-       <combo_box.item
-         name="Copy"
-         label="Copy"
-         value="2" />
-       <combo_box.item
-         name="Contents"
-         label="Contents"
-         value="3" />
-       <combo_box.item
-         name="Original"
-         label="Original"
-         value="1" />
-    </combo_box>
-    <spinner
-        follows="left|top"
-        decimal_digits="0"
-        increment="1"
-        control_name="Edit Cost"
-        name="Edit Cost"
-        label="Price:"
-        label_width="100"
-        left="10"
-        width="192"
-        min_val="1"
-        height="19"
-        max_val="999999999"
-        top_pad="5"/>
-    <text
-        type="string"
-        length="1"
-        height="15"
-        follows="left|top"
-        layout="topleft"
-        left_delta="82"
-        name="CurrencySymbol"
-        top_delta="1"
-        width="18">
-      L$
-    </text>
-
-    <!--line_editor
-     border_style="line"
-     border_thickness="1"
-     follows="left|top|right"
-     height="16"
-     layout="topleft"
-     left_pad="5"
-     max_length_bytes="25"
-     name="EditPrice"
-     top_delta="0"
-     width="242" /-->
-
-    <!--text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="BaseMaskDebug"
-     top="155"
-     width="330">
-        B:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="60"
-     name="OwnerMaskDebug"
-     top_delta="0"
-     width="270">
-        O:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="60"
-     name="GroupMaskDebug"
-     top_delta="0"
-     width="210">
-        G:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="60"
-     name="EveryoneMaskDebug"
-     top_delta="0"
-     width="150">
-        E:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="60"
-     name="NextMaskDebug"
-     top_delta="0"
-     width="90">
-        N:
-    </text-->
-
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
deleted file mode 100644
index a8a3ad08f8..0000000000
--- a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="PROPIEDADES DEL ÍTEM DEL INVENTARIO">
-	<floater.string name="unknown">(desconocido)</floater.string>
-	<floater.string name="public">(público)</floater.string>
-	<floater.string name="you_can">Usted puede:</floater.string>
-	<floater.string name="owner_can">El propietario puede:</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local][day,datetime,local] [mth,datetime,local] [year,datetime,local][hour,datetime,local]:[min,datetime,local]:[second,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Nombre:</text>
-	<text name="LabelItemDescTitle">Descripción:</text>
-	<text name="LabelCreatorTitle">Creador:</text>
-	<button label="Perfil..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">Propietario:</text>
-	<button label="Perfil..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Adquirido:</text>
-	<text name="LabelAcquiredDate">May Mié 24 12:50:46 2006</text>
-	<text name="OwnerLabel">Tú:</text>
-	<check_box label="Editar" name="CheckOwnerModify"/>
-	<check_box label="Copiarlo" left_delta="88" name="CheckOwnerCopy"/>
-	<check_box label="Revender" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">Cualquiera:</text>
-	<check_box label="Copiar" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">Grupo:</text>
-	<check_box label="Compartir" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="230">Próximo propietario:</text>
-	<check_box label="Editar" name="CheckNextOwnerModify"/>
-	<check_box label="Copiarlo" left_delta="88" name="CheckNextOwnerCopy"/>
-	<check_box label="Revender" name="CheckNextOwnerTransfer"/>
-	<check_box label="En venta" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Copiar" name="Copy"/>
-		<combo_box.item label="Contenidos" name="Contents"/>
-		<combo_box.item label="Original" name="Original"/>
-	</combo_box>
-	<spinner label="Precio:" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
deleted file mode 100644
index 1d4e7c818f..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="PROPRIÉTÉS DES ARTICLES DE L&apos;INVENTAIRE">
-	<floater.string name="unknown">(inconnu)</floater.string>
-	<floater.string name="public">(public)</floater.string>
-	<floater.string name="you_can">Vous pouvez :</floater.string>
-	<floater.string name="owner_can">Le propriétaire peut :</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Nom :</text>
-	<text name="LabelItemDescTitle">Description :</text>
-	<text name="LabelCreatorTitle">Créateur :</text>
-	<button label="Profil..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">Propriétaire :</text>
-	<button label="Profil..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Acquis :</text>
-	<text name="LabelAcquiredDate">Wed May 24 12:50:46 2006</text>
-	<text name="OwnerLabel">Vous :</text>
-	<check_box label="Modifier" name="CheckOwnerModify"/>
-	<check_box label="Copier" name="CheckOwnerCopy"/>
-	<check_box label="Revendre" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel" width="80">N&apos;importe qui :</text>
-	<check_box label="Copier" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel" width="80">Groupe :</text>
-	<check_box label="Partager" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="192">Le prochain propriétaire :</text>
-	<check_box label="Modifier" name="CheckNextOwnerModify"/>
-	<check_box label="Copier" name="CheckNextOwnerCopy"/>
-	<check_box label="Revendre" name="CheckNextOwnerTransfer"/>
-	<check_box label="À vendre" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Copier" name="Copy"/>
-		<combo_box.item label="Contenu" name="Contents"/>
-		<combo_box.item label="Original" name="Original"/>
-	</combo_box>
-	<spinner label="Prix :" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
deleted file mode 100644
index 8cf680b3f0..0000000000
--- a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="CARATTERISTICHE DELL&apos;ARTICOLO IN INVENTARIO">
-	<floater.string name="unknown">(sconosciuto)</floater.string>
-	<floater.string name="public">(pubblico)</floater.string>
-	<floater.string name="you_can">Tu puoi:</floater.string>
-	<floater.string name="owner_can">Il proprietario può:</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Nome:</text>
-	<text name="LabelItemDescTitle">Descrizione:</text>
-	<text name="LabelCreatorTitle">Creatore:</text>
-	<button label="Profilo..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">proprietario:</text>
-	<button label="Profilo..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Acquisito:</text>
-	<text name="LabelAcquiredDate">Wed May 24 12:50:46 2006</text>
-	<text name="OwnerLabel">Tu:</text>
-	<check_box label="Modifica" name="CheckOwnerModify"/>
-	<check_box label="Copiare" left_delta="88" name="CheckOwnerCopy"/>
-	<check_box label="Rivendi" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">Chiunque:</text>
-	<check_box label="Copia" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">Gruppo:</text>
-	<check_box label="Condividi" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="230">Proprietario successivo:</text>
-	<check_box label="Modifica" name="CheckNextOwnerModify"/>
-	<check_box label="Copiare" left_delta="88" name="CheckNextOwnerCopy"/>
-	<check_box label="Rivendi" name="CheckNextOwnerTransfer"/>
-	<check_box label="In vendita" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Copia" name="Copy"/>
-		<combo_box.item label="Contenuti" name="Contents"/>
-		<combo_box.item label="Originale" name="Original"/>
-	</combo_box>
-	<spinner label="Prezzo:" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
deleted file mode 100644
index 8d3a655a06..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="インベントリアイテムのプロパティ">
-	<floater.string name="unknown">(不明）</floater.string>
-	<floater.string name="public">(公共)</floater.string>
-	<floater.string name="you_can">できること：</floater.string>
-	<floater.string name="owner_can">オーナーは次のことができます：</floater.string>
-	<floater.string name="acquiredDate">[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">名前：</text>
-	<text name="LabelItemDescTitle">説明：</text>
-	<text name="LabelCreatorTitle">クリエーター</text>
-	<button label="プロフィール..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">オーナー：</text>
-	<button label="プロフィール..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">入手日時：</text>
-	<text name="LabelAcquiredDate">2006年5月24日水曜日12:50:46</text>
-	<text name="OwnerLabel">あなた：</text>
-	<check_box label="編集" name="CheckOwnerModify"/>
-	<check_box label="コピー" name="CheckOwnerCopy"/>
-	<check_box label="再販・プレゼント" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">全員：</text>
-	<check_box label="コピー" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">グループ：</text>
-	<check_box label="共有" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="158">次の所有者：</text>
-	<check_box label="編集" name="CheckNextOwnerModify"/>
-	<check_box label="コピー" name="CheckNextOwnerCopy"/>
-	<check_box label="再販・プレゼント" name="CheckNextOwnerTransfer"/>
-	<check_box label="売り出し中" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="コピー" name="Copy"/>
-		<combo_box.item label="コンテンツ" name="Contents"/>
-		<combo_box.item label="オリジナル" name="Original"/>
-	</combo_box>
-	<spinner label="価格：" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
deleted file mode 100644
index d2844e117f..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="item properties" title="WŁAŚCIWOŚCI OBIEKTÓW W SZAFIE">
-	<floater.string name="unknown">
-		(nieznany)
-	</floater.string>
-	<floater.string name="public">
-		(publiczny)
-	</floater.string>
-	<floater.string name="you_can">
-		Ty możesz:
-	</floater.string>
-	<floater.string name="owner_can">
-		Właściciel może:
-	</floater.string>
-	<text name="LabelItemNameTitle">
-		Nazwa:
-	</text>
-	<text name="LabelItemDescTitle">
-		Opis:
-	</text>
-	<text name="LabelCreatorTitle">
-		Twórca:
-	</text>
-	<button label="Profil..." name="BtnCreator" />
-	<text name="LabelOwnerTitle">
-		Właściciel:
-	</text>
-	<button label="Profil..." name="BtnOwner" />
-	<text name="LabelAcquiredTitle">
-		Nabyte:
-	</text>
-	<text name="OwnerLabel">
-		Ty:
-	</text>
-	<check_box label="Modyfikacja" name="CheckOwnerModify" />
-	<check_box label="Kopiowanie" name="CheckOwnerCopy" />
-	<check_box label="Transferowanie" name="CheckOwnerTransfer" />
-	<text name="AnyoneLabel">
-		Każdy:
-	</text>
-	<check_box label="Kopiowanie" name="CheckEveryoneCopy" />
-	<text name="GroupLabel">
-		Grupa:
-	</text>
-	<check_box label="Udostępnij" name="CheckShareWithGroup" />
-	<text name="NextOwnerLabel">
-		Nast. właściciel:
-	</text>
-	<check_box label="Modyfikacja" name="CheckNextOwnerModify" />
-	<check_box label="Kopiowanie" name="CheckNextOwnerCopy" />
-	<check_box label="Transferowanie" name="CheckNextOwnerTransfer" />
-	<check_box label="Sprzedaż" name="CheckPurchase" />
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Kopia" name="Copy" />
-		<combo_box.item label="Zawartość" name="Contents" />
-		<combo_box.item label="Oryginał" name="Original" />
-	</combo_box>
-	<spinner name="Edit Cost" label="Cena:" />
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
deleted file mode 100644
index 5f04c08531..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="PROPRIEDADES DE ITEM NO INVENTÁRIO">
-	<floater.string name="unknown">(desconhecido)</floater.string>
-	<floater.string name="public">(público)</floater.string>
-	<floater.string name="you_can">Você pode:</floater.string>
-	<floater.string name="owner_can">Proprietário pode :</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Nome:</text>
-	<text name="LabelItemDescTitle">Descrição:</text>
-	<text name="LabelCreatorTitle">Criador:</text>
-	<button label="Perfil..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">Dono:</text>
-	<button label="Perfil..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Adquirido:</text>
-	<text name="LabelAcquiredDate">Qua Mai 24 12:50:46 2006</text>
-	<text name="OwnerLabel">Você:</text>
-	<check_box label="Editar" name="CheckOwnerModify"/>
-	<check_box label="Copiar" name="CheckOwnerCopy"/>
-	<check_box label="Revender" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">Todos:</text>
-	<check_box label="Cortar" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">Grupo:</text>
-	<check_box label="Compartilhar" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="230">Próximo proprietário:</text>
-	<check_box label="Editar" name="CheckNextOwnerModify"/>
-	<check_box label="Copiar" name="CheckNextOwnerCopy"/>
-	<check_box label="Revender" name="CheckNextOwnerTransfer"/>
-	<check_box label="À venda" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Cortar" name="Copy"/>
-		<combo_box.item label="Conteúdo" name="Contents"/>
-		<combo_box.item label="Original" name="Original"/>
-	</combo_box>
-	<spinner label="Preço:" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
deleted file mode 100644
index c988825756..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="СВОЙСТВА ПРЕДМЕТА">
-	<floater.string name="unknown">(неизвестно)</floater.string>
-	<floater.string name="public">(публичное)</floater.string>
-	<floater.string name="you_can">Вы можете:</floater.string>
-	<floater.string name="owner_can">Владелец может:</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local], [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Название:</text>
-	<text name="LabelItemDescTitle">Описание:</text>
-	<text name="LabelCreatorTitle">Создатель:</text>
-	<button label="Профиль…" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">Владелец:</text>
-	<button label="Профиль…" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Приобретено:</text>
-	<text name="LabelAcquiredDate">Ср 24 Май 12:50:46 2006</text>
-	<text name="OwnerLabel">Вы:</text>
-	<check_box label="Изменить" name="CheckOwnerModify"/>
-	<check_box label="Копировать" name="CheckOwnerCopy"/>
-	<check_box label="Перепродать" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">Все:</text>
-	<check_box label="Копировать" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">Группа:</text>
-	<check_box label="Поделиться" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel">Следующий владелец:</text>
-	<check_box label="Изменить" name="CheckNextOwnerModify"/>
-	<check_box label="Копировать" name="CheckNextOwnerCopy"/>
-	<check_box label="Перепродать" name="CheckNextOwnerTransfer"/>
-	<check_box label="Для продажи" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Копировать" name="Copy"/>
-		<combo_box.item label="Содержимое" name="Contents"/>
-		<combo_box.item label="Оригинал" name="Original"/>
-	</combo_box>
-	<spinner label="Цена:" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml
deleted file mode 100644
index c6a5515c6e..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="ENVANTER ÖGESİ ÖZELLİKLERİ">
-	<floater.string name="unknown">(bilinmiyor)</floater.string>
-	<floater.string name="public">(kamuya açık)</floater.string>
-	<floater.string name="you_can">Şunu yapabilirsiniz:</floater.string>
-	<floater.string name="owner_can">Sahip şunu yapabilir:</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Ad:</text>
-	<text name="LabelItemDescTitle">Açıklama:</text>
-	<text name="LabelCreatorTitle">Oluşturan:</text>
-	<button label="Profil..." name="BtnCreator"/>
-	<text name="LabelOwnerTitle">Sahip:</text>
-	<button label="Profil..." name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Alınan:</text>
-	<text name="LabelAcquiredDate">24 Mayıs Çarş 12:50:46 2006</text>
-	<text name="OwnerLabel">Siz:</text>
-	<check_box label="Düzenle" name="CheckOwnerModify"/>
-	<check_box label="Kopyala" name="CheckOwnerCopy"/>
-	<check_box label="Tekrar Sat" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">Herkes:</text>
-	<check_box label="Kopyala" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">Grup:</text>
-	<check_box label="Paylaş" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel">Sonraki sahip:</text>
-	<check_box label="Düzenle" name="CheckNextOwnerModify"/>
-	<check_box label="Kopyala" name="CheckNextOwnerCopy"/>
-	<check_box label="Tekrar Sat" name="CheckNextOwnerTransfer"/>
-	<check_box label="Satılık" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Kopyala" name="Copy"/>
-		<combo_box.item label="İçerik" name="Contents"/>
-		<combo_box.item label="Orijinal" name="Original"/>
-	</combo_box>
-	<spinner label="Fiyat:" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
deleted file mode 100644
index 4f17b96579..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="收納區物品屬性">
-	<floater.string name="unknown">（未知）</floater.string>
-	<floater.string name="public">（公開）</floater.string>
-	<floater.string name="you_can">你可以：</floater.string>
-	<floater.string name="owner_can">所有人可以：</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">名稱：</text>
-	<text name="LabelItemDescTitle">描述：</text>
-	<text name="LabelCreatorTitle">創造者：</text>
-	<button label="檔案..." name="BtnCreator"/>
-	<text name="LabelOwnerTitle">所有人：</text>
-	<button label="檔案..." name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">取得於：</text>
-	<text name="LabelAcquiredDate">Wed May 24 12:50:46 2006</text>
-	<text name="OwnerLabel">你：</text>
-	<check_box label="編輯" name="CheckOwnerModify"/>
-	<check_box label="恚庨" name="CheckOwnerCopy"/>
-	<check_box label="轉售" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">任何人：</text>
-	<check_box label="恚庨" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">群組：</text>
-	<check_box label="分享" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel">下一個所有人：</text>
-	<check_box label="編輯" name="CheckNextOwnerModify"/>
-	<check_box label="恚庨" name="CheckNextOwnerCopy"/>
-	<check_box label="轉售" name="CheckNextOwnerTransfer"/>
-	<check_box label="出售" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="複製" name="Copy"/>
-		<combo_box.item label="內容" name="Contents"/>
-		<combo_box.item label="原件" name="Original"/>
-	</combo_box>
-	<spinner label="價格：" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
-- 
cgit v1.2.3


From 693825158f478c478c1ab510c6f7304ae7f4a2ed Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 8 Feb 2023 14:35:56 +0200
Subject: SL-19134 Remove lock icon, add item type icon

---
 .../skins/default/xui/en/sidepanel_item_info.xml   | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 320c20deb6..7fb9fb828d 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -60,28 +60,28 @@
       layout="topleft"
       follows="all"
       height="25">
+      <icon
+        follows="top|left"
+        height="16"
+        image_name="Inv_Object"
+        layout="topleft"
+        left="5"
+        mouse_opaque="true"
+        name="item_type_icon"
+        top="3"
+        width="16" />
       <line_editor
         border_style="line"
         border_thickness="1"
         follows="left|top|right"
         layout="topleft"
-        left="5"
+        left_pad="5"
         top="1"
-        right="-25"
+        right="-5"
         height="20"
         max_length_bytes="63"
         name="LabelItemName"
         tool_tip="The name is limited to 63 characters. Longer prim names are cut short. Names can only consist of printable characters found in the ASCII-7 (non-extended) character set, with the exception of the vertical bar/pipe &apos;|&apos;." />
-      <icon
-        follows="top|right"
-        height="18"
-        image_name="Lock"
-        layout="topleft"
-        right="-5"
-        mouse_opaque="true"
-        name="IconLocked"
-        top="3"
-        width="18" />
     </layout_panel>
     
     <layout_panel
@@ -248,7 +248,7 @@ TestString PleaseIgnore
         height="0"
         layout="topleft"
         left="5"
-        right="-6"
+        right="-5"
         name="cost_text_border"
         top="1"/>
         
@@ -385,7 +385,7 @@ TestString PleaseIgnore
         height="0"
         layout="topleft"
         left="5"
-        right="-6"
+        right="-5"
         name="cost_text_border"
         top_pad="9"/>
         
-- 
cgit v1.2.3


From e06c322971aeba9a065efb6f53139010243aa428 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 8 Feb 2023 17:43:49 +0200
Subject: SL-19134 Multiline description field

---
 .../newview/skins/default/xui/en/sidepanel_item_info.xml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 7fb9fb828d..8b0f8f7550 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -183,7 +183,7 @@ TestString PleaseIgnore
       name="layout_item_description"
       layout="topleft"
       follows="all"
-      height="61">
+      height="84">
       <text
         type="string"
         length="1"
@@ -196,19 +196,23 @@ TestString PleaseIgnore
         width="78">
         Description:
       </text>
-      <line_editor
+      <text_editor
+        text_type="ascii_printable_no_pipe"
+        commit_on_focus_lost="true"
         border_style="line"
         border_thickness="1"
-        follows="left|top|right"
+        word_wrap="true"
+        use_ellipses="false"
+        follows="all"
         layout="topleft"
         left="5"
         top_pad="5"
         right="-5"
-        height="23"
-        max_length_bytes="127"
+        height="46"
+        max_length="127"
         name="LabelItemDesc"
         tool_tip="When people have &apos;Hover Tips on All Objects&apos; selected in the viewer's settings, they'll see the object description pop-up for any object under their mouse pointer. The prim description is limited to 127 bytes any string longer then that will be truncated." />
-        
+
         <text
           type="string"
           length="1"
-- 
cgit v1.2.3


From e145a829bb2099e4c40342cf4c7a15cd9344c56f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 11 Feb 2023 04:16:22 +0200
Subject: SL-19203 Change default link color from green to blue

---
 indra/newview/skins/default/colors.xml                  | 2 +-
 indra/newview/skins/default/xui/en/floater_snapshot.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 8bb3feaeb0..87ccccbff0 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -407,7 +407,7 @@
      value="0.43 0.06 0.06 1" />
     <color
      name="HTMLLinkColor"
-     reference="EmphasisColor" />
+     value="0.3 0.82 1 1" />
     <color
      name="HealthTextColor"
      reference="White" />
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index f441e3cbd7..fcd24d83bb 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -440,7 +440,7 @@
     length="1"
     halign="right"
     name="360_label"
-    text_color="0.3 0.82 1 1"
+    text_color="HTMLLinkColor"
     top_delta="0"
     type="string"
     width="115">
-- 
cgit v1.2.3


From 734b1b5d421254c45b3eb0fe0a5bbc8159e489fc Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 17 Feb 2023 15:47:03 +0200
Subject: SL-19105 WIP Single-folder inventory view

---
 .../skins/default/xui/en/floater_my_inventory.xml  |   4 +-
 .../skins/default/xui/en/menu_inventory.xml        |  14 +
 .../default/xui/en/menu_inventory_gear_default.xml |  37 +-
 .../default/xui/en/menu_inventory_view_default.xml |   3 +
 indra/newview/skins/default/xui/en/menu_viewer.xml |   9 +
 .../skins/default/xui/en/panel_main_inventory.xml  | 394 +++++++++++++--------
 .../skins/default/xui/en/sidepanel_inventory.xml   |   8 +-
 7 files changed, 318 insertions(+), 151 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
index f182d27da8..1b4f323d04 100644
--- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -5,14 +5,14 @@
  can_resize="true"
  height="570"
  help_topic="sidebar_inventory"
- min_width="333"
+ min_width="363"
  min_height="590"
  name="floater_my_inventory"
  save_rect="true"
  save_visibility="true"
  reuse_instance="true"
  title="INVENTORY"
- width="333" >
+ width="363" >
    <panel
     class="sidepanel_inventory"
     name="main_panel"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index aa3d0ae071..5fe53526c7 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -401,6 +401,20 @@
          parameter="model" />
       </menu_item_call>
     </menu>
+    <menu_item_call
+     label="Open"
+     layout="topleft"
+     name="open_in_current_window">
+      <menu_item_call.on_click
+       function="Inventory.OpenSelectedFolder"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Open in new window"
+     layout="topleft"
+     name="open_in_new_window">
+      <menu_item_call.on_click
+       function="Inventory.OpenNewFolderWindow"/>
+    </menu_item_call>
     <menu
      label="Change Type"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index 3fb2e01e5b..027dd40d08 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -6,15 +6,39 @@
  mouse_opaque="false"
  name="menu_gear_default"
  visible="false">
+    <menu_item_call
+     label="Open"
+     layout="topleft"
+     name="open_in_current_window">
+       <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="open_in_current_window" />
+       <on_enable
+         function="Inventory.GearDefault.Enable"
+         parameter="open_folder" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="single_folder_view" />
+    </menu_item_call>
+    <menu_item_call
+     label="Open in new window"
+     layout="topleft"
+     name="open_in_new_window">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="open_in_new_window" />
+        <on_enable
+         function="Inventory.GearDefault.Enable"
+         parameter="open_folder" />
+    </menu_item_call>
     <menu_item_call
      label="New Folder Window"
      layout="topleft"
      shortcut="control|shift|J"
-     enabled="false"
      name="new_single_folder">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
-         parameter="new_window" />
+         parameter="new_single_folder_window" />
     </menu_item_call>
     <menu_item_call
      label="New Inventory Window"
@@ -32,6 +56,9 @@
         <on_click
          function="Inventory.GearDefault.Custom.Action"
          parameter="close_folders" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
     </menu_item_call>
     <menu_item_separator
      layout="topleft" />
@@ -115,6 +142,9 @@
         <on_enable
          function="Inventory.GearDefault.Enable"
          parameter="empty_lostnfound" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
     </menu_item_call>
     <menu_item_call
      label="Empty Trash"
@@ -126,5 +156,8 @@
         <on_enable
          function="Inventory.GearDefault.Enable"
          parameter="empty_trash" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
     </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
index 6e3cfd9cee..0fcdb1cda0 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -49,5 +49,8 @@
         <on_check
          function="Inventory.GearDefault.Check"
          parameter="sort_system_folders_to_top" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
     </menu_item_check>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 58584345a9..de11a2c0e9 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -36,6 +36,15 @@
          function="Inventory.NewWindow"
          parameter="" />
       </menu_item_call>
+      <menu_item_call
+       label="New Folder Window"
+       name="new_single_folder"
+       shortcut="control|shift|J"
+       visible="false">
+        <menu_item_call.on_click
+         function="Inventory.NewFolderWindow"
+         parameter="" />
+      </menu_item_call>
       <menu_item_call
        label="Places..."
        name="Places"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index d437f98e91..606c2175d8 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -23,6 +23,9 @@
    name="ItemcountUnknown">
     Fetched [ITEM_COUNT] Items and [CATEGORY_COUNT] Folders [FILTER]
   </panel.string>
+  <panel.string name="inventory_title">INVENTORY</panel.string>
+  <panel.string name="default_mode_btn">Command_AboutLand_Icon</panel.string>
+  <panel.string name="single_folder_mode_btn">Command_Map_Icon</panel.string>
   <text
 		     type="string"
 		     length="1"
@@ -38,157 +41,262 @@
 		     width="300">
     Items:
   </text>
-  <combo_box
-   height="23"
-   layout="topleft"
-   left="3"
-   top="18"
-   name="search_type"
-   follows="top|left"
-   width="67">
-    <item
-     label="Name"
-     name="Name"
-     value="search_by_name"/>
-    <item
-     label="Creator"
-     name="Creator"
-     value="search_by_creator"/>
-    <item
-     label="Description"
-     name="Description"
-     value="search_by_description"/>
-    <item
-     label="UUID"
-     name="UUID"
-     value="search_by_UUID"/>
-  </combo_box>
-  <menu_button
-   follows="top|left"
-   tool_tip="Show search visibility options"
-   height="23"
-   image_overlay="Inv_Toolbar_SearchVisibility"
-   layout="topleft"
-   left_pad="1"
-   name="options_visibility_btn"
-   width="31" />
-  <filter_editor
-   text_pad_left="10"
+  <layout_stack
    follows="left|top|right"
-   height="23"
-   label="Enter search text"
-   layout="topleft"
-   left_pad="1"
-   max_length_chars="300"
-   highlight_text_field="true"
-   name="inventory search editor"
-   width="99" />
-  <menu_button
-   follows="top|right"
-   tool_tip="Show additional options"
-   height="23"
-   image_hover_unselected="Toolbar_Middle_Over"
-   image_overlay="OptionsMenu_Off"
-   image_selected="Toolbar_Middle_Selected"
-   image_unselected="Toolbar_Middle_Off"
-   layout="topleft"
-   left_pad="1"
-   name="options_gear_btn"
-   width="31" />
-  <menu_button
-   follows="top|right"
-   tool_tip="View/sort options"
-   height="23"
-   image_hover_unselected="Toolbar_Middle_Over"
-   image_overlay="Conv_toolbar_sort"
-   image_selected="Toolbar_Middle_Selected"
-   image_unselected="Toolbar_Middle_Off"
-   layout="topleft"
-   left_pad="1"
-   name="view_btn"
-   width="31" />
-  <button
-   follows="top|right"
-   height="23"
-   image_hover_unselected="Toolbar_Middle_Over"
-   image_overlay="AddItem_Off"
-   image_selected="Toolbar_Middle_Selected"
-   image_unselected="Toolbar_Middle_Off"
-   layout="topleft"
-   left_pad="1"
-   name="add_btn"
-   tool_tip="Add new item"
-   width="31" />
-  <button
-   follows="top|right"
-   tool_tip="Toggles between traditional and single-folder views"
-   height="23"
-   image_hover_unselected="Toolbar_Middle_Over"
-   image_overlay="Command_Map_Icon"
-   image_selected="Toolbar_Middle_Selected"
-   image_unselected="Toolbar_Middle_Off"
-   layout="topleft"
-   left_pad="1"
-   enabled="false"
-   name="view_mode_btn"
-   width="31" />
-  <tab_container
+   height="25"
+   animate="false"
+   top_pad="10"
+   left="2"
+   orientation="horizontal">
+    <layout_panel
+     border="false"
+     bevel_style="in"
+     user_resize="false"
+     auto_resize="false"
+     height="25"
+     width="65"
+     name="nav_buttons"
+     visible="false">
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Arrow_Left"
+      image_pressed="Arrow_Left"
+      image_unselected="Arrow_Left"
+      scale_image="false"
+      layout="topleft"
+      left="3"
+      top="2"
+      name="back_btn"
+      tool_tip="Back"
+      width="20" />
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Arrow_Right"
+      image_pressed="Arrow_Right"
+      image_unselected="Arrow_Right"
+      scale_image="false"
+      layout="topleft"
+      left_pad="1"
+      name="forward_btn"
+      tool_tip="Forward"
+      width="20" />
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Arrow_Up"
+      image_pressed="Arrow_Up"
+      image_unselected="Arrow_Up"
+      scale_image="false"
+      layout="topleft"
+      left_pad="1"
+      name="up_btn"
+      tool_tip="Go up one level"
+      width="20" />
+    </layout_panel>
+    <layout_panel
+      border="false"
+      bevel_style="in"
+      user_resize="false"
+      height="25"
+      width="375"
+      visible="true">
+      <combo_box
+       height="23"
+       layout="topleft"
+       left="2"
+       top="0"
+       name="search_type"
+       tool_tip="Search by"
+       follows="top|left"
+       width="67">
+       <item
+        label="Name"
+        name="Name"
+        value="search_by_name"/>
+       <item
+        label="Creator"
+        name="Creator"
+        value="search_by_creator"/>
+       <item
+        label="Description"
+        name="Description"
+        value="search_by_description"/>
+       <item
+        label="UUID"
+        name="UUID"
+        value="search_by_UUID"/>
+      </combo_box>
+      <menu_button
+       follows="top|left"
+       tool_tip="Search visibility options"
+       height="23"
+       image_overlay="Inv_Toolbar_SearchVisibility"
+       layout="topleft"
+       left_pad="1"
+       name="options_visibility_btn"
+       width="31" />
+      <filter_editor
+       text_pad_left="10"
+       follows="left|top|right"
+       height="23"
+       label="Enter search text"
+       layout="topleft"
+       left_pad="1"
+       max_length_chars="300"
+       highlight_text_field="true"
+       name="inventory search editor"
+       width="150" />
+      <menu_button
+       follows="top|right"
+       tool_tip="Actions"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
+       image_overlay="OptionsMenu_Off"
+       image_selected="Toolbar_Middle_Selected"
+       image_unselected="Toolbar_Middle_Off"
+       layout="topleft"
+       left_pad="1"
+       name="options_gear_btn"
+       width="31" />
+      <menu_button
+       follows="top|right"
+       tool_tip="View &amp; sort options"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
+       image_overlay="Conv_toolbar_sort"
+       image_selected="Toolbar_Middle_Selected"
+       image_unselected="Toolbar_Middle_Off"
+       layout="topleft"
+       left_pad="1"
+       name="view_btn"
+       width="31" />
+      <button
+       follows="top|right"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
+       image_overlay="AddItem_Off"
+       image_selected="Toolbar_Middle_Selected"
+       image_unselected="Toolbar_Middle_Off"
+       layout="topleft"
+       left_pad="1"
+       name="add_btn"
+       tool_tip="Create new item"
+       width="31" />
+      <button
+       follows="top|right"
+       tool_tip="Switch between views"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
+       image_overlay="Command_Map_Icon"
+       image_selected="Toolbar_Middle_Selected"
+       image_unselected="Toolbar_Middle_Off"
+       layout="topleft"
+       left_pad="1"
+       name="view_mode_btn"
+       width="31" />
+    </layout_panel>
+    </layout_stack>
+    <panel
      follows="all"
      halign="center"
      height="372"
      layout="topleft"
      left="7"
-     name="inventory filter tabs"
-     tab_height="30"
-     tab_position="top"
-     tab_min_width="100"
+     name="default_inventory_panel"
      top_pad="10"
      width="312">
-    <inventory_panel
-     bg_opaque_color="DkGray2"
-     bg_alpha_color="DkGray2"
-     background_visible="true"
-     border="false"
-     bevel_style="none"
+      <tab_container
+       follows="all"
+       halign="center"
+       height="372"
+       layout="topleft"
+       left="0"
+       name="inventory filter tabs"
+       tab_height="30"
+       tab_position="top"
+       tab_min_width="100"
+       top="0"
+       width="312">
+        <inventory_panel
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         follows="all"
+         height="338"
+         label="MY INVENTORY"
+         help_topic="my_inventory_tab"
+         layout="topleft"
+         left="0"
+         name="All Items"
+         sort_order_setting="InventorySortOrder"
+         show_item_link_overlays="true"
+         top="16"
+         width="288" />
+        <recent_inventory_panel
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         follows="all"
+         height="338"
+         label="RECENT"
+         help_topic="recent_inventory_tab"
+         layout="topleft"
+         left_delta="0"
+         name="Recent Items"
+         show_item_link_overlays="true"
+         width="290" />
+        <inventory_panel
+         name="Worn Items"
+         label="WORN"
+         show_empty_message="false"
+         follows="all"
+         layout="topleft"
+         width="290"
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         scroll.reserve_scroll_corner="false">
+        </inventory_panel>
+      </tab_container>
+    </panel>
+    <panel
      follows="all"
-     height="338"
-     label="MY INVENTORY"
-     help_topic="my_inventory_tab"
-     layout="topleft"
-     left="0"
-     name="All Items"
-     sort_order_setting="InventorySortOrder"
-     show_item_link_overlays="true"
-     top="16"
-     width="288" />
-    <recent_inventory_panel
-     bg_opaque_color="DkGray2"
-     bg_alpha_color="DkGray2"
-     background_visible="true"
-     border="false"
-     bevel_style="none"
-     follows="all"
-     height="338"
-     label="RECENT"
-     help_topic="recent_inventory_tab"
+     halign="center"
+     height="372"
      layout="topleft"
-     left_delta="0"
-     name="Recent Items"
-     show_item_link_overlays="true"
-     width="290" />
-       <inventory_panel
-      name="Worn Items"
-      label="WORN"
-      show_empty_message="false"
-      follows="all"
-      layout="topleft"
-      width="290"
-      bg_opaque_color="DkGray2"
-      bg_alpha_color="DkGray2"
-      background_visible="true"
-      border="false"
-      bevel_style="none"
-      scroll.reserve_scroll_corner="false">
-  </inventory_panel>
-  </tab_container>
+     left="7"
+     name="single_folder_inventory"
+     top_delta="0"
+     visible="false"
+     width="312">
+      <single_folder_inventory_panel
+       name="single_folder_inv"
+       show_empty_message="false"
+       follows="all"
+       left="0"
+       top="0"
+       top_pad="5"
+       height="372"
+       width="312"
+       layout="topleft"
+       bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
+       border="false"
+       bevel_style="none"
+       scroll.reserve_scroll_corner="false">
+        <item folder_indentation="0"/>
+        <folder
+         single_folder_mode="true"
+         folder_indentation="0"/>
+      </single_folder_inventory_panel>
+    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 82eb629670..a4b7f48c5e 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -18,7 +18,7 @@
 		 height="570"
 		 visible="true"
 		 default_tab_group="1"
-		 width="355">
+		 width="395">
       <layout_stack
               follows="left|right|top|bottom"
               layout="topleft"
@@ -28,14 +28,14 @@
               orientation="vertical"
               name="inventory_layout_stack"
               height="565"
-              width="355">
+              width="395">
              <layout_panel
                  name="main_inventory_layout_panel"
                  layout="topleft"
                  auto_resize="true"
                  user_resize="true"
                  min_dim="150"
-                 width="355"
+                 width="395"
                  follows="bottom|left|right"
                  height="300">
                  <panel
@@ -48,7 +48,7 @@
                       top="0"
                       label=""
                       height="300"
-                      width="355" />
+                      width="395" />
              </layout_panel>
 			    <layout_panel
                  width="355"
-- 
cgit v1.2.3


From ec02220f068c7e7ec61e8c8af7a3c4c96c112172 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 15 Feb 2023 02:19:49 +0200
Subject: SL-19108 WIP Managing inventory thumbnail #1

---
 .../xui/en/floater_change_item_thumbnail.xml       | 118 +++++++++++++++++++++
 .../skins/default/xui/en/menu_inventory.xml        |   8 ++
 2 files changed, 126 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
new file mode 100644
index 0000000000..c2c4c07ca1
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_resize="false"
+ height="366"
+ layout="topleft"
+ name="change_item_thumbnail"
+ help_topic="change_item_thumbnail"
+ title="CHANGE ITEM IMAGE"
+ width="320">
+  <icon
+    follows="top|left"
+    height="16"
+    image_name="Inv_Object"
+    layout="topleft"
+    left="5"
+    mouse_opaque="true"
+    name="item_type_icon"
+    top="5"
+    width="16" />
+  <line_editor
+    border_style="line"
+    border_thickness="1"
+    follows="left|top|right"
+    font="SansSerif"
+    height="19"
+    layout="topleft"
+    top_delta="-2"
+    left_pad="5"
+    max_length_bytes="127"
+    name="item_name"
+    width="286" />
+
+  <thumbnail
+    name="item_thumbnail"
+    follows="top|left"
+    layout="topleft"
+    left="31"
+    top_pad="9"
+    height="256"
+    width="256"
+        />
+
+  <button
+    follows="right|bottom"
+    height="32"
+    label="A"
+    layout="topleft"
+    left="37"
+    name="upload_local"
+    top_pad="9"
+    width="32" />
+  
+  <button
+    follows="right|bottom"
+    height="32"
+    label="B"
+    layout="topleft"
+    left_pad="10"
+    name="upload_snapshot"
+    top_delta="0"
+    width="32" />
+
+  <button
+    follows="right|bottom"
+    height="32"
+    label="C"
+    layout="topleft"
+    left_pad="10"
+    name="use_texture"
+    top_delta="0"
+    width="32" />
+
+  <button
+    follows="right|bottom"
+    height="32"
+    label="D"
+    layout="topleft"
+    left_pad="10"
+    name="to_clipboard"
+    top_delta="0"
+    width="32" />
+
+  <button
+    follows="right|bottom"
+    height="32"
+    label="E"
+    layout="topleft"
+    left_pad="10"
+    name="from_clipboard"
+    top_delta="0"
+    width="32" />
+
+  <button
+    follows="right|bottom"
+    height="32"
+    label="F"
+    layout="topleft"
+    left_pad="10"
+    name="remove"
+    top_delta="0"
+    width="32" />
+
+  <text
+    type="string"
+    halign="center"
+    length="1"
+    follows="left|top"
+    height="17"
+    layout="topleft"
+    left="5"
+    right="-5"
+    name="LabelOwnerTitle"
+    top_pad="12"
+    width="78">
+    tooltip
+  </text>
+  
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 5fe53526c7..97a93245ff 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -618,6 +618,14 @@
          function="Inventory.DoToSelected"
          parameter="rename" />
     </menu_item_call>
+    <menu_item_call
+     label="Image..."
+     layout="topleft"
+     name="thumbnail">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="thumbnail" />
+    </menu_item_call>
     <menu_item_call
      label="Copy Asset UUID"
      layout="topleft"
-- 
cgit v1.2.3


From f2d46651b92d949a63d2b3a5dd774dce6a6752c7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 15 Feb 2023 23:56:49 +0200
Subject: SL-19108 WIP Managing inventory thumbnail #2

---
 .../xui/en/floater_change_item_thumbnail.xml       | 48 ++++++++++++++++------
 1 file changed, 35 insertions(+), 13 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index c2c4c07ca1..f177ed0c0b 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -6,7 +6,33 @@
  name="change_item_thumbnail"
  help_topic="change_item_thumbnail"
  title="CHANGE ITEM IMAGE"
- width="320">
+ width="319">
+
+  <floater.string
+    name="tooltip_upload_local">
+    Upload from computer
+  </floater.string>
+  <floater.string
+    name="tooltip_upload_snapshot">
+    Use snapshot tool
+  </floater.string>
+  <floater.string
+    name="tooltip_use_texture">
+    Choose texture
+  </floater.string>
+  <floater.string
+    name="tooltip_copy_to_clipboard">
+    Copy to clipboard
+  </floater.string>
+  <floater.string
+    name="tooltip_paste_from_clipboard">
+    Paste from clipboard
+  </floater.string>
+  <floater.string
+    name="tooltip_remove_image">
+    Remove image
+  </floater.string>
+  
   <icon
     follows="top|left"
     height="16"
@@ -28,13 +54,14 @@
     left_pad="5"
     max_length_bytes="127"
     name="item_name"
-    width="286" />
+    width="286"
+    enabled="false"/>
 
   <thumbnail
     name="item_thumbnail"
     follows="top|left"
     layout="topleft"
-    left="31"
+    left="32"
     top_pad="9"
     height="256"
     width="256"
@@ -45,11 +72,10 @@
     height="32"
     label="A"
     layout="topleft"
-    left="37"
+    left="38"
     name="upload_local"
     top_pad="9"
     width="32" />
-  
   <button
     follows="right|bottom"
     height="32"
@@ -59,7 +85,6 @@
     name="upload_snapshot"
     top_delta="0"
     width="32" />
-
   <button
     follows="right|bottom"
     height="32"
@@ -69,34 +94,31 @@
     name="use_texture"
     top_delta="0"
     width="32" />
-
   <button
     follows="right|bottom"
     height="32"
     label="D"
     layout="topleft"
     left_pad="10"
-    name="to_clipboard"
+    name="copy_to_clipboard"
     top_delta="0"
     width="32" />
-
   <button
     follows="right|bottom"
     height="32"
     label="E"
     layout="topleft"
     left_pad="10"
-    name="from_clipboard"
+    name="paste_from_clipboard"
     top_delta="0"
     width="32" />
-
   <button
     follows="right|bottom"
     height="32"
     label="F"
     layout="topleft"
     left_pad="10"
-    name="remove"
+    name="remove_image"
     top_delta="0"
     width="32" />
 
@@ -109,7 +131,7 @@
     layout="topleft"
     left="5"
     right="-5"
-    name="LabelOwnerTitle"
+    name="tooltip_text"
     top_pad="12"
     width="78">
     tooltip
-- 
cgit v1.2.3


From 8fdd6849995748b144b811d2e9585aeb2c56562d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 17 Feb 2023 18:54:50 +0200
Subject: SL-19108 WIP Managing inventory thumbnail #3

---
 .../xui/en/floater_change_item_thumbnail.xml       |  4 ++--
 .../skins/default/xui/en/sidepanel_item_info.xml   | 22 ++++++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index f177ed0c0b..c30a3ba761 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -41,7 +41,7 @@
     left="5"
     mouse_opaque="true"
     name="item_type_icon"
-    top="5"
+    top="4"
     width="16" />
   <line_editor
     border_style="line"
@@ -50,7 +50,7 @@
     font="SansSerif"
     height="19"
     layout="topleft"
-    top_delta="-2"
+    top_delta="-1"
     left_pad="5"
     max_length_bytes="127"
     name="item_name"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 8b0f8f7550..f755ec0ec4 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -89,14 +89,14 @@
       name="layout_item_details"
       layout="topleft"
       follows="all"
-      height="130">
+      height="133">
       
       <thumbnail
         name="item_thumbnail"
         follows="top|left"
         layout="topleft"
         left="5"
-        top="0"
+        top="2"
         height="128"
         width="128"
         />
@@ -105,7 +105,7 @@
         type="string"
         length="1"
         follows="left|top"
-        height="17"
+        height="16"
         layout="topleft"
         left_pad="5"
         name="LabelOwnerTitle"
@@ -131,7 +131,7 @@ TestString PleaseIgnore
         type="string"
         length="1"
         follows="left|top"
-        height="17"
+        height="16"
         layout="topleft"
         left_delta="0"
         name="LabelCreatorTitle"
@@ -157,7 +157,7 @@ TestString PleaseIgnore
         type="string"
         length="1"
         follows="left|top"
-        height="17"
+        height="16"
         layout="topleft"
         left_delta="0"
         name="LabelAcquiredTitle"
@@ -169,13 +169,23 @@ TestString PleaseIgnore
         type="string"
         length="1"
         follows="left|top|right"
-        height="23"
+        height="18"
         layout="topleft"
         left_delta="0"
         name="LabelAcquiredDate"
         top_pad="0"
         width="187">
+        00/00/00
       </text>
+      <button
+        follows="left|top"
+        height="21"
+        label="Image..."
+        layout="topleft"
+        left_delta="0"
+        name="change_thumbnail_btn"
+        top_pad="0"
+        width="120" />
     </layout_panel>
     
     <layout_panel
-- 
cgit v1.2.3


From 6ea8e9d7163f2d8d0b71f262e445a993b3c3aea1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 17 Feb 2023 23:37:22 +0200
Subject: SL-19108 Build fix

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index c30a3ba761..97c6ecee20 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -38,7 +38,7 @@
     height="16"
     image_name="Inv_Object"
     layout="topleft"
-    left="5"
+    left="7"
     mouse_opaque="true"
     name="item_type_icon"
     top="4"
@@ -51,7 +51,7 @@
     height="19"
     layout="topleft"
     top_delta="-1"
-    left_pad="5"
+    left_pad="3"
     max_length_bytes="127"
     name="item_name"
     width="286"
-- 
cgit v1.2.3


From 603053807cb0bb0026058c8b01decd042300bd93 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sun, 19 Feb 2023 18:51:55 +0200
Subject: SL-19108 WIP Managing inventory thumbnail #4

Added icons
---
 .../default/textures/icons/copy_clipboard.png      | Bin 0 -> 3443 bytes
 .../skins/default/textures/icons/delete_icon.png   | Bin 0 -> 3570 bytes
 .../skins/default/textures/icons/file_upload.png   | Bin 0 -> 3191 bytes
 .../default/textures/icons/paste_clipboard.png     | Bin 0 -> 3412 bytes
 .../skins/default/textures/icons/snapshot_icon.png | Bin 0 -> 3341 bytes
 .../skins/default/textures/icons/texture_icon.png  | Bin 0 -> 2812 bytes
 indra/newview/skins/default/textures/textures.xml  |  12 +++++
 .../xui/en/floater_change_item_thumbnail.xml       |  54 ++++++++++++++-------
 8 files changed, 48 insertions(+), 18 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/copy_clipboard.png
 create mode 100644 indra/newview/skins/default/textures/icons/delete_icon.png
 create mode 100644 indra/newview/skins/default/textures/icons/file_upload.png
 create mode 100644 indra/newview/skins/default/textures/icons/paste_clipboard.png
 create mode 100644 indra/newview/skins/default/textures/icons/snapshot_icon.png
 create mode 100644 indra/newview/skins/default/textures/icons/texture_icon.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/copy_clipboard.png b/indra/newview/skins/default/textures/icons/copy_clipboard.png
new file mode 100644
index 0000000000..bb1ceff1ce
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/copy_clipboard.png differ
diff --git a/indra/newview/skins/default/textures/icons/delete_icon.png b/indra/newview/skins/default/textures/icons/delete_icon.png
new file mode 100644
index 0000000000..37ce374653
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/delete_icon.png differ
diff --git a/indra/newview/skins/default/textures/icons/file_upload.png b/indra/newview/skins/default/textures/icons/file_upload.png
new file mode 100644
index 0000000000..58f2757136
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/file_upload.png differ
diff --git a/indra/newview/skins/default/textures/icons/paste_clipboard.png b/indra/newview/skins/default/textures/icons/paste_clipboard.png
new file mode 100644
index 0000000000..e1589ab098
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/paste_clipboard.png differ
diff --git a/indra/newview/skins/default/textures/icons/snapshot_icon.png b/indra/newview/skins/default/textures/icons/snapshot_icon.png
new file mode 100644
index 0000000000..41d524678f
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/snapshot_icon.png differ
diff --git a/indra/newview/skins/default/textures/icons/texture_icon.png b/indra/newview/skins/default/textures/icons/texture_icon.png
new file mode 100644
index 0000000000..278760a5b0
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/texture_icon.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 1f2c0867c4..1941c388b7 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -252,10 +252,16 @@ with the same filename but different name
   <texture name="Icon_Close_Foreground" file_name="windows/Icon_Close_Foreground.png" preload="true" />
   <texture name="Icon_Close_Press" file_name="windows/Icon_Close_Press.png" preload="true" />
   <texture name="Icon_Close_Toast" file_name="windows/Icon_Close_Toast.png" preload="true" />
+  
+  <texture name="Icon_Copy" file_name="icons/copy_clipboard.png" preload="true" />
+  
+  <texture name="Icon_Delete" file_name="icons/delete_icon.png" preload="true" />
 
   <texture name="Icon_Dock_Foreground" file_name="windows/Icon_Dock_Foreground.png" preload="true" />
   <texture name="Icon_Dock_Press" file_name="windows/Icon_Dock_Press.png" preload="true" />
 
+  <texture name="Icon_File_Upload" file_name="icons/file_upload.png" preload="true" />
+  
   <texture name="Icon_For_Sale" file_name="icons/Icon_For_Sale.png" preload="false" />
 
   <texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="false" />
@@ -268,10 +274,16 @@ with the same filename but different name
 
   <texture name="Icon_Minimize_Foreground" file_name="windows/Icon_Minimize_Foreground.png" preload="true" />
   <texture name="Icon_Minimize_Press" file_name="windows/Icon_Minimize_Press.png" preload="true" />
+  
+  <texture name="Icon_Paste" file_name="icons/paste_clipboard.png" preload="true" />
 
   <texture name="Icon_Restore_Foreground" file_name="windows/Icon_Restore_Foreground.png" preload="false" />
   <texture name="Icon_Restore_Press" file_name="windows/Icon_Restore_Press.png" preload="false" />
 
+  <texture name="Icon_Snapshot" file_name="icons/snapshot_icon.png" preload="true" />
+  
+  <texture name="Icon_Use_Texture" file_name="icons/texture_icon.png" preload="true" />
+
   <texture name="Info" file_name="icons/Info.png" preload="false" />
   <texture name="Info_Small" file_name="icons/Info_Small.png" preload="false" />
   <texture name="Info_Off" file_name="navbar/Info_Off.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index 97c6ecee20..9657290f1f 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -69,57 +69,75 @@
 
   <button
     follows="right|bottom"
-    height="32"
-    label="A"
     layout="topleft"
-    left="38"
+    image_hover_unselected="Toolbar_Middle_Over"
+    image_overlay="Icon_File_Upload"
+    image_selected="Toolbar_Middle_Selected"
+    image_unselected="Toolbar_Middle_Off"
     name="upload_local"
+    left="38"
     top_pad="9"
+    height="32"
     width="32" />
   <button
     follows="right|bottom"
-    height="32"
-    label="B"
     layout="topleft"
-    left_pad="10"
+    image_hover_unselected="Toolbar_Middle_Over"
+    image_overlay="Icon_Snapshot"
+    image_selected="Toolbar_Middle_Selected"
+    image_unselected="Toolbar_Middle_Off"
     name="upload_snapshot"
+    left_pad="10"
     top_delta="0"
+    height="32"
     width="32" />
   <button
     follows="right|bottom"
-    height="32"
-    label="C"
     layout="topleft"
-    left_pad="10"
+    image_hover_unselected="Toolbar_Middle_Over"
+    image_overlay="Icon_Use_Texture"
+    image_selected="Toolbar_Middle_Selected"
+    image_unselected="Toolbar_Middle_Off"
     name="use_texture"
+    left_pad="10"
     top_delta="0"
+    height="32"
     width="32" />
   <button
     follows="right|bottom"
-    height="32"
-    label="D"
     layout="topleft"
-    left_pad="10"
+    image_hover_unselected="Toolbar_Middle_Over"
+    image_overlay="Icon_Copy"
+    image_selected="Toolbar_Middle_Selected"
+    image_unselected="Toolbar_Middle_Off"
     name="copy_to_clipboard"
+    left_pad="10"
     top_delta="0"
+    height="32"
     width="32" />
   <button
     follows="right|bottom"
-    height="32"
-    label="E"
     layout="topleft"
-    left_pad="10"
+    image_hover_unselected="Toolbar_Middle_Over"
+    image_overlay="Icon_Paste"
+    image_selected="Toolbar_Middle_Selected"
+    image_unselected="Toolbar_Middle_Off"
     name="paste_from_clipboard"
+    left_pad="10"
     top_delta="0"
+    height="32"
     width="32" />
   <button
     follows="right|bottom"
-    height="32"
-    label="F"
     layout="topleft"
-    left_pad="10"
+    image_hover_unselected="Toolbar_Middle_Over"
+    image_overlay="Icon_Delete"
+    image_selected="Toolbar_Middle_Selected"
+    image_unselected="Toolbar_Middle_Off"
     name="remove_image"
+    left_pad="10"
     top_delta="0"
+    height="32"
     width="32" />
 
   <text
-- 
cgit v1.2.3


From 6a260bb3f0bc5bf726ad1c3f98e39d3fb9679484 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 20 Feb 2023 22:24:46 +0200
Subject: SL-19108 Rename outfit snapshot floater

---
 .../xui/en/floater_simple_outfit_snapshot.xml      | 50 ----------------------
 .../default/xui/en/floater_simple_snapshot.xml     | 50 ++++++++++++++++++++++
 2 files changed, 50 insertions(+), 50 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_simple_outfit_snapshot.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_simple_snapshot.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_simple_outfit_snapshot.xml b/indra/newview/skins/default/xui/en/floater_simple_outfit_snapshot.xml
deleted file mode 100644
index 5ece7b85d5..0000000000
--- a/indra/newview/skins/default/xui/en/floater_simple_outfit_snapshot.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- positioning="cascading"
- legacy_header_height="18"
- can_minimize="true"
- can_resize="false"
- can_close="true"
- height="305"
- layout="topleft"
- name="simple_outfit_snapshot"
- single_instance="true"
- help_topic="snapshot"
- save_rect="true"
- save_visibility="false"
- title="OUTFIT SNAPSHOT"
- width="351">
-  <ui_ctrl
-   layout="topleft"
-   name="thumbnail_placeholder"
-   top="18"
-   left="22"
-   width="335"
-   height="200"
-   follows="top|left"/>
-  <button
-   follows="left|bottom"
-   height="22"
-   layout="topleft"
-   left="29"
-   label="Take photo"
-   name="new_snapshot_btn"
-   bottom="-15"
-   width="90" />
-  <button
-   follows="left|bottom"
-   height="22"
-   layout="topleft"
-   left_pad="10"
-   label="Save (L$[UPLOAD_COST])"
-   name="save_btn"
-   width="90" />
-  <button
-   follows="left|bottom"
-   height="22"
-   layout="topleft"
-   left_pad="10"
-   label="Cancel"
-   name="cancel_btn"
-   width="90" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
new file mode 100644
index 0000000000..1e47a3b35d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ positioning="cascading"
+ legacy_header_height="18"
+ can_minimize="true"
+ can_resize="false"
+ can_close="true"
+ height="305"
+ layout="topleft"
+ name="simple_snapshot"
+ single_instance="true"
+ help_topic="snapshot"
+ save_rect="true"
+ save_visibility="false"
+ title="OUTFIT SNAPSHOT"
+ width="351">
+  <ui_ctrl
+   layout="topleft"
+   name="thumbnail_placeholder"
+   top="18"
+   left="22"
+   width="335"
+   height="200"
+   follows="top|left"/>
+  <button
+   follows="left|bottom"
+   height="22"
+   layout="topleft"
+   left="29"
+   label="Take photo"
+   name="new_snapshot_btn"
+   bottom="-15"
+   width="90" />
+  <button
+   follows="left|bottom"
+   height="22"
+   layout="topleft"
+   left_pad="10"
+   label="Save (L$[UPLOAD_COST])"
+   name="save_btn"
+   width="90" />
+  <button
+   follows="left|bottom"
+   height="22"
+   layout="topleft"
+   left_pad="10"
+   label="Cancel"
+   name="cancel_btn"
+   width="90" />
+</floater>
-- 
cgit v1.2.3


From 6786e43fcb315eb10b5ab4a205163fb424c18bc6 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 21 Feb 2023 00:13:41 +0200
Subject: SL-19108 Managing inventory thumbnail

---
 indra/newview/skins/default/xui/en/floater_simple_snapshot.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
index 1e47a3b35d..a53d42be2e 100644
--- a/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
@@ -12,7 +12,7 @@
  help_topic="snapshot"
  save_rect="true"
  save_visibility="false"
- title="OUTFIT SNAPSHOT"
+ title="THUMBNAIL SNAPSHOT"
  width="351">
   <ui_ctrl
    layout="topleft"
-- 
cgit v1.2.3


From d6f1ba31da4a40d62fe781419cdd7db9843f6a30 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 21 Feb 2023 14:44:45 +0200
Subject: SL-19105 Updated icons, menus and Received items panel visibility in
 single-folder mode

---
 .../default/textures/icons/multi_folder_mode.png   | Bin 0 -> 2786 bytes
 .../default/textures/icons/single_folder_back.png  | Bin 0 -> 3276 bytes
 .../textures/icons/single_folder_forward.png       | Bin 0 -> 3260 bytes
 .../default/textures/icons/single_folder_mode.png  | Bin 0 -> 2780 bytes
 .../default/textures/icons/single_folder_up.png    | Bin 0 -> 3118 bytes
 indra/newview/skins/default/textures/textures.xml  |   6 +++
 .../default/xui/en/menu_inventory_gear_default.xml |  16 +++---
 .../default/xui/en/menu_inventory_view_default.xml |  56 +++++++++++++++++++++
 .../skins/default/xui/en/panel_main_inventory.xml  |  24 ++++-----
 9 files changed, 82 insertions(+), 20 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/multi_folder_mode.png
 create mode 100644 indra/newview/skins/default/textures/icons/single_folder_back.png
 create mode 100644 indra/newview/skins/default/textures/icons/single_folder_forward.png
 create mode 100644 indra/newview/skins/default/textures/icons/single_folder_mode.png
 create mode 100644 indra/newview/skins/default/textures/icons/single_folder_up.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/multi_folder_mode.png b/indra/newview/skins/default/textures/icons/multi_folder_mode.png
new file mode 100644
index 0000000000..8cda3efc36
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/multi_folder_mode.png differ
diff --git a/indra/newview/skins/default/textures/icons/single_folder_back.png b/indra/newview/skins/default/textures/icons/single_folder_back.png
new file mode 100644
index 0000000000..b614e9ef9b
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/single_folder_back.png differ
diff --git a/indra/newview/skins/default/textures/icons/single_folder_forward.png b/indra/newview/skins/default/textures/icons/single_folder_forward.png
new file mode 100644
index 0000000000..c7bee3522d
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/single_folder_forward.png differ
diff --git a/indra/newview/skins/default/textures/icons/single_folder_mode.png b/indra/newview/skins/default/textures/icons/single_folder_mode.png
new file mode 100644
index 0000000000..f70b754123
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/single_folder_mode.png differ
diff --git a/indra/newview/skins/default/textures/icons/single_folder_up.png b/indra/newview/skins/default/textures/icons/single_folder_up.png
new file mode 100644
index 0000000000..651b2b1af1
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/single_folder_up.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 1941c388b7..5d9c362e78 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -886,4 +886,10 @@ with the same filename but different name
   <texture name="System_Notification" file_name="icons/SL_Logo.png" preload="true"/>
   <texture name="Icon_Attachment_Small" file_name="icons/Icon_Attachment_Small.png"	preload="true"/>
   <texture name="Icon_Attachment_Large" file_name="icons/Icon_Attachment_Large.png"	preload="true"/>
+
+  <texture name="Single_Folder_Mode" file_name="icons/single_folder_mode.png" preload="true"/>
+  <texture name="Multi_Folder_Mode" file_name="icons/multi_folder_mode.png" preload="true"/>
+  <texture name="Single_Folder_Back" file_name="icons/single_folder_back.png" preload="true"/>
+  <texture name="Single_Folder_Forward" file_name="icons/single_folder_forward.png" preload="true"/>
+  <texture name="Single_Folder_Up" file_name="icons/single_folder_up.png" preload="true"/>
 </textures>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index 027dd40d08..e58eaf79a3 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -13,12 +13,9 @@
        <on_click
          function="Inventory.GearDefault.Custom.Action"
          parameter="open_in_current_window" />
-       <on_enable
-         function="Inventory.GearDefault.Enable"
-         parameter="open_folder" />
         <on_visible
          function="Inventory.GearDefault.Visible"
-         parameter="single_folder_view" />
+         parameter="open_folder" />
     </menu_item_call>
     <menu_item_call
      label="Open in new window"
@@ -27,8 +24,8 @@
         <on_click
          function="Inventory.GearDefault.Custom.Action"
          parameter="open_in_new_window" />
-        <on_enable
-         function="Inventory.GearDefault.Enable"
+        <on_visible
+         function="Inventory.GearDefault.Visible"
          parameter="open_folder" />
     </menu_item_call>
     <menu_item_call
@@ -130,8 +127,11 @@
              function="Inventory.GearDefault.Custom.Action"
              parameter="replace_links" />
         </menu_item_call>
-    <menu_item_separator
-     layout="topleft" />
+    <menu_item_separator>
+        <menu_item_separator.on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
+    </menu_item_separator>
     <menu_item_call
      label="Empty Lost and Found"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
index 0fcdb1cda0..b89ff832b9 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -53,4 +53,60 @@
          function="Inventory.GearDefault.Visible"
          parameter="multi_folder_view" />
     </menu_item_check>
+    <menu_item_separator>
+        <menu_item_separator.on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="single_folder_view" />
+    </menu_item_separator>
+    <menu_item_check
+     label="List view"
+     layout="topleft"
+     name="list_view">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="list_view" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="list_view" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="single_folder_view" />
+    </menu_item_check>
+    <menu_item_check
+     label="Gallery view"
+     layout="topleft"
+     name="gallery_view">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="gallery_view" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="gallery_view" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="single_folder_view" />
+    </menu_item_check>
+    <menu_item_check
+     label="Combination view"
+     layout="topleft"
+     name="combination_view">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="combination_view" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="combination_view" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="single_folder_view" />
+    </menu_item_check>
+    <menu_item_separator/>
+    <menu_item_call
+     label="Inventory settings..."
+     layout="topleft"
+     name="inv_settings">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="inv_settings" />
+    </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 606c2175d8..16ad6f60db 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -24,8 +24,8 @@
     Fetched [ITEM_COUNT] Items and [CATEGORY_COUNT] Folders [FILTER]
   </panel.string>
   <panel.string name="inventory_title">INVENTORY</panel.string>
-  <panel.string name="default_mode_btn">Command_AboutLand_Icon</panel.string>
-  <panel.string name="single_folder_mode_btn">Command_Map_Icon</panel.string>
+  <panel.string name="default_mode_btn">Multi_Folder_Mode</panel.string>
+  <panel.string name="single_folder_mode_btn">Single_Folder_Mode</panel.string>
   <text
 		     type="string"
 		     length="1"
@@ -60,9 +60,9 @@
      <button
       follows="top|left"
       height="23"
-      image_selected="Arrow_Left"
-      image_pressed="Arrow_Left"
-      image_unselected="Arrow_Left"
+      image_selected="Single_Folder_Back"
+      image_pressed="Single_Folder_Back"
+      image_unselected="Single_Folder_Back"
       scale_image="false"
       layout="topleft"
       left="3"
@@ -73,9 +73,9 @@
      <button
       follows="top|left"
       height="23"
-      image_selected="Arrow_Right"
-      image_pressed="Arrow_Right"
-      image_unselected="Arrow_Right"
+      image_selected="Single_Folder_Forward"
+      image_pressed="Single_Folder_Forward"
+      image_unselected="Single_Folder_Forward"
       scale_image="false"
       layout="topleft"
       left_pad="1"
@@ -85,9 +85,9 @@
      <button
       follows="top|left"
       height="23"
-      image_selected="Arrow_Up"
-      image_pressed="Arrow_Up"
-      image_unselected="Arrow_Up"
+      image_selected="Single_Folder_Up"
+      image_pressed="Single_Folder_Up"
+      image_unselected="Single_Folder_Up"
       scale_image="false"
       layout="topleft"
       left_pad="1"
@@ -189,7 +189,7 @@
        tool_tip="Switch between views"
        height="23"
        image_hover_unselected="Toolbar_Middle_Over"
-       image_overlay="Command_Map_Icon"
+       image_overlay="Single_Folder_Mode"
        image_selected="Toolbar_Middle_Selected"
        image_unselected="Toolbar_Middle_Off"
        layout="topleft"
-- 
cgit v1.2.3


From d6c0e40559fa090495b237bbbacf30578ac10aac Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 21 Feb 2023 17:53:47 +0200
Subject: SL-19108 Enabled Image changing floater for folders

---
 indra/newview/skins/default/xui/en/notifications.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d1a99133f0..ceae31967e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6094,7 +6094,21 @@ Are you sure you want to delete them?
      notext="Cancel"
      yestext="OK"/>
   </notification>
-  
+
+  <notification
+   icon="alertmodal.tga"
+   name="DeleteThumbnail"
+   type="alertmodal">
+    <unique/>
+    Delete the image for this item? There is no undo.
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Don't show me this again"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="Delete"/>
+  </notification>
+
   <notification
      icon="alertmodal.tga"
      name="ConfirmUnlink"
-- 
cgit v1.2.3


From 2d68a7c33622aa28c49989e959c2a9be1f053d03 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 21 Feb 2023 23:03:00 +0200
Subject: SL-19108 Update Simple snapshot floater

---
 .../default/xui/en/floater_simple_snapshot.xml     |  4 +--
 .../default/xui/en/menu_gallery_outfit_tab.xml     | 32 +++-------------------
 .../skins/default/xui/en/menu_outfit_gear.xml      |  6 ++--
 3 files changed, 9 insertions(+), 33 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
index a53d42be2e..97ea59593e 100644
--- a/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
@@ -12,7 +12,7 @@
  help_topic="snapshot"
  save_rect="true"
  save_visibility="false"
- title="THUMBNAIL SNAPSHOT"
+ title="ITEM SNAPSHOT"
  width="351">
   <ui_ctrl
    layout="topleft"
@@ -36,7 +36,7 @@
    height="22"
    layout="topleft"
    left_pad="10"
-   label="Save (L$[UPLOAD_COST])"
+   label="Save"
    name="save_btn"
    width="90" />
   <button
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
index 99ca910062..0ca505dd5d 100755
--- a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
@@ -42,35 +42,11 @@
         parameter="take_off" />
     </menu_item_call>
     <menu_item_call
-        label="Upload Photo (L$[UPLOAD_COST])"
-        layout="topleft"
-        name="upload_photo">
-        <on_click
-        function="Outfit.UploadPhoto" />
-    </menu_item_call>
-    <menu_item_call
-        label="Select Photo"
-        layout="topleft"
-        name="select_photo">
+     label="Image..."
+     layout="topleft"
+     name="thumbnail">
         <on_click
-        function="Outfit.SelectPhoto" />
-    </menu_item_call>
-    <menu_item_call
-        label="Take a Snapshot"
-        layout="topleft"
-        name="take_snapshot">
-        <on_click
-        function="Outfit.TakeSnapshot" />
-    </menu_item_call>
-    <menu_item_call
-        label="Remove Photo"
-        layout="topleft"
-        name="remove_photo">
-        <on_click
-        function="Outfit.RemovePhoto" />
-        <on_visible
-        function="Outfit.OnVisible"
-        parameter="remove_photo" />
+         function="Outfit.Thumbnail" />
     </menu_item_call>
     <menu_item_separator name="sepatator1" />
     <menu
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 32d9d28434..0f7a7e8d56 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -40,11 +40,11 @@
          parameter="take_off" />
     </menu_item_call>
     <menu_item_call
-     label="Upload Photo (L$[UPLOAD_COST])"
+     label="Image..."
      layout="topleft"
-     name="upload_photo">
+     name="thumbnail">
         <on_click
-         function="Gear.UploadPhoto" />
+         function="Gear.Thumbnail" />
     </menu_item_call>
     <menu_item_call
      label="Select Photo"
-- 
cgit v1.2.3


From 4eee501517e756b6bbb942585290b806fc46d278 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 22 Feb 2023 01:41:49 +0200
Subject: SL-19108 Cleanup Outfit Galery #2

---
 .../skins/default/xui/en/menu_outfit_gear.xml       | 21 ---------------------
 1 file changed, 21 deletions(-)

(limited to 'indra/newview/skins')

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 0f7a7e8d56..e216962d12 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -46,27 +46,6 @@
         <on_click
          function="Gear.Thumbnail" />
     </menu_item_call>
-    <menu_item_call
-     label="Select Photo"
-     layout="topleft"
-     name="select_photo">
-        <on_click
-         function="Gear.SelectPhoto" />
-    </menu_item_call>
-    <menu_item_call
-     label="Take a Snapshot"
-     layout="topleft"
-     name="take_snapshot">
-        <on_click
-         function="Gear.TakeSnapshot" />
-    </menu_item_call>
-    <menu_item_call
-     label="Remove Photo"
-     layout="topleft"
-     name="remove_photo">
-        <on_click
-         function="Gear.RemovePhoto" />
-    </menu_item_call>
   <menu_item_separator name="sepatator1" />
             <!-- copied (with minor modifications) from menu_inventory_add.xml -->
             <!--  *TODO: generate dynamically? -->
-- 
cgit v1.2.3


From 7904649923eddb1291c336ac59b51b78e90c9137 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 22 Feb 2023 20:29:01 +0200
Subject: SL-19105 Update menu items; show items count on selection in
 single-folder mode

---
 .../skins/default/xui/en/menu_inventory.xml        | 326 ++++-----------------
 .../default/xui/en/menu_inventory_gear_default.xml |   2 +-
 2 files changed, 63 insertions(+), 265 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 97a93245ff..8374e63219 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -159,262 +159,6 @@
          function="Inventory.DoCreate"
          parameter="outfit" />
     </menu_item_call>
-    <menu_item_call
-     label="New Script"
-     layout="topleft"
-     name="New Script">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="lsl" />
-    </menu_item_call>
-    <menu_item_call
-     label="New Notecard"
-     layout="topleft"
-     name="New Note">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="notecard" />
-    </menu_item_call>
-    <menu_item_call
-     label="New Gesture"
-     layout="topleft"
-     name="New Gesture">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="gesture" />
-    </menu_item_call>
-    <menu
-     label="New Clothes"
-     layout="topleft"
-     name="New Clothes">
-        <menu_item_call
-         label="New Shirt"
-         layout="topleft"
-         name="New Shirt">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="shirt" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Pants"
-         layout="topleft"
-         name="New Pants">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="pants" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Shoes"
-         layout="topleft"
-         name="New Shoes">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="shoes" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Socks"
-         layout="topleft"
-         name="New Socks">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="socks" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Jacket"
-         layout="topleft"
-         name="New Jacket">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="jacket" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Skirt"
-         layout="topleft"
-         name="New Skirt">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="skirt" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Gloves"
-         layout="topleft"
-         name="New Gloves">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="gloves" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Undershirt"
-         layout="topleft"
-         name="New Undershirt">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="undershirt" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Underpants"
-         layout="topleft"
-         name="New Underpants">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="underpants" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Alpha Mask"
-         layout="topleft"
-         name="New Alpha Mask">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="alpha" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Tattoo"
-         layout="topleft"
-         name="New Tattoo">
-            <menu_item_call.on_click
-             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"
-         name="New Physics">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="physics" />
-        </menu_item_call>
-    </menu>
-    <menu
-     label="New Body Parts"
-     layout="topleft"
-     name="New Body Parts">
-        <menu_item_call
-         label="New Shape"
-         layout="topleft"
-         name="New Shape">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="shape" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Skin"
-         layout="topleft"
-         name="New Skin">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="skin" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Hair"
-         layout="topleft"
-         name="New Hair">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="hair" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Eyes"
-         layout="topleft"
-         name="New Eyes">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="eyes" />
-        </menu_item_call>
-    </menu>
-    <menu
-     label="New Settings"
-     layout="topleft"
-     name="New Settings">
-        <menu_item_call
-         label="New Sky"
-         layout="topleft"
-         name="New Sky">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="sky"/>
-            <menu_item_call.on_enable
-                    function="Inventory.EnvironmentEnabled" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Water"
-         layout="topleft"
-         name="New Water">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="water"/>
-            <menu_item_call.on_enable
-                    function="Inventory.EnvironmentEnabled" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Day Cycle"
-         layout="topleft"
-         name="New Day Cycle">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="daycycle"/>
-            <menu_item_call.on_enable
-                    function="Inventory.EnvironmentEnabled" />
-        </menu_item_call>
-    </menu>
-    <menu
-     label="Use as default for"
-     layout="topleft"
-     name="upload_def">
-      <menu_item_call
-       label="Image uploads"
-       layout="topleft"
-       name="Image uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="texture" />
-      </menu_item_call>
-      <menu_item_call
-       label="Sound uploads"
-       layout="topleft"
-       name="Sound uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="sound" />
-      </menu_item_call>
-      <menu_item_call
-       label="Animation uploads"
-       layout="topleft"
-       name="Animation uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="animation" />
-      </menu_item_call>
-      <menu_item_call
-       label="Model uploads"
-       layout="topleft"
-       name="Model uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="model" />
-      </menu_item_call>
-    </menu>
-    <menu_item_call
-     label="Open"
-     layout="topleft"
-     name="open_in_current_window">
-      <menu_item_call.on_click
-       function="Inventory.OpenSelectedFolder"/>
-    </menu_item_call>
-    <menu_item_call
-     label="Open in new window"
-     layout="topleft"
-     name="open_in_new_window">
-      <menu_item_call.on_click
-       function="Inventory.OpenNewFolderWindow"/>
-    </menu_item_call>
     <menu
      label="Change Type"
      layout="topleft"
@@ -610,14 +354,6 @@
          function="Inventory.DoToSelected"
          parameter="properties" />
     </menu_item_call>
-    <menu_item_call
-     label="Rename"
-     layout="topleft"
-     name="Rename">
-        <menu_item_call.on_click
-         function="Inventory.DoToSelected"
-         parameter="rename" />
-    </menu_item_call>
     <menu_item_call
      label="Image..."
      layout="topleft"
@@ -645,6 +381,31 @@
     <menu_item_separator
      layout="topleft" 
      name="Copy Separator" />
+    <menu_item_call
+     label="Open"
+     layout="topleft"
+     name="open_in_current_window">
+        <menu_item_call.on_click
+         function="Inventory.OpenSelectedFolder"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Open in new window"
+     layout="topleft"
+     name="open_in_new_window">
+        <menu_item_call.on_click
+         function="Inventory.OpenNewFolderWindow"/>
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="Open Folder Separator" />
+    <menu_item_call
+     label="Rename"
+     layout="topleft"
+     name="Rename">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="rename" />
+    </menu_item_call>
     <menu_item_call
      label="Cut"
      layout="topleft"
@@ -953,6 +714,43 @@
      function="Inventory.DoToSelected"
      parameter="ungroup_folder_items" />
   </menu_item_call>
+  <menu
+   label="Use as default for"
+   layout="topleft"
+   name="upload_def">
+    <menu_item_call
+     label="Image uploads"
+     layout="topleft"
+     name="Image uploads">
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+        parameter="texture" />
+    </menu_item_call>
+    <menu_item_call
+     label="Sound uploads"
+     layout="topleft"
+     name="Sound uploads">
+    <menu_item_call.on_click
+     function="Inventory.FileUploadLocation"
+     parameter="sound" />
+    </menu_item_call>
+    <menu_item_call
+     label="Animation uploads"
+     layout="topleft"
+     name="Animation uploads">
+    <menu_item_call.on_click
+     function="Inventory.FileUploadLocation"
+     parameter="animation" />
+    </menu_item_call>
+    <menu_item_call
+     label="Model uploads"
+     layout="topleft"
+     name="Model uploads">
+    <menu_item_call.on_click
+     function="Inventory.FileUploadLocation"
+     parameter="model" />
+    </menu_item_call>
+  </menu>
 	<menu_item_separator
 	 layout="topleft"
 	 name="Marketplace Separator" />
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index e58eaf79a3..f778742ed9 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -26,7 +26,7 @@
          parameter="open_in_new_window" />
         <on_visible
          function="Inventory.GearDefault.Visible"
-         parameter="open_folder" />
+         parameter="open_new_folder" />
     </menu_item_call>
     <menu_item_call
      label="New Folder Window"
-- 
cgit v1.2.3


From 4886682d0458f901fc5b24ed8b58300b93489ac9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 22 Feb 2023 21:28:04 +0200
Subject: SL-19108 Multi instance snapshot floater

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
index 97ea59593e..484ad159d1 100644
--- a/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
@@ -2,13 +2,13 @@
 <floater
  positioning="cascading"
  legacy_header_height="18"
- can_minimize="true"
+ can_minimize="false"
  can_resize="false"
  can_close="true"
  height="305"
  layout="topleft"
  name="simple_snapshot"
- single_instance="true"
+ single_instance="false"
  help_topic="snapshot"
  save_rect="true"
  save_visibility="false"
-- 
cgit v1.2.3


From a2c61cfe35cfe3edb6fcedc09e9529c9a2940ed0 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 22 Feb 2023 21:40:23 +0200
Subject: SL-19108 Remove grey background fron name in 'change item thumbnail'

---
 .../skins/default/xui/en/floater_change_item_thumbnail.xml    | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index 9657290f1f..f5c266c553 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -38,24 +38,21 @@
     height="16"
     image_name="Inv_Object"
     layout="topleft"
-    left="7"
+    left="10"
     mouse_opaque="true"
     name="item_type_icon"
     top="4"
     width="16" />
-  <line_editor
-    border_style="line"
-    border_thickness="1"
+  <text
     follows="left|top|right"
     font="SansSerif"
     height="19"
     layout="topleft"
-    top_delta="-1"
+    top_delta="1"
     left_pad="3"
     max_length_bytes="127"
     name="item_name"
-    width="286"
-    enabled="false"/>
+    width="286"/>
 
   <thumbnail
     name="item_thumbnail"
-- 
cgit v1.2.3


From 49da5288bd0425241823186bfd56a159fe2f9a60 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 24 Feb 2023 03:05:30 +0200
Subject: SL-19234 add Inventory settings floater

---
 .../default/xui/en/floater_inventory_settings.xml  | 169 +++++++++++++++++++++
 .../default/xui/en/menu_inventory_view_default.xml |  14 +-
 2 files changed, 177 insertions(+), 6 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_inventory_settings.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
new file mode 100644
index 0000000000..c3e81a5523
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_close="true"
+ can_minimize="true"
+ can_resize="false"
+ save_rect="true"
+ height="350"
+ width="370"
+ name="inventory_settings"
+ title="Inventory settings">
+ <icon
+  follows="top|left"
+  height="18"
+  image_name="Multi_Folder_Mode"
+  layout="topleft"
+  left="18"
+  mouse_opaque="true"
+  name="multi_folder_icon"
+  top="25"
+  width="18" />
+ <text
+   type="string"
+   length="1"
+   follows="left|top|right"
+   height="13"
+   layout="topleft"
+   left_pad="12"
+   top_delta="2"
+   name="multi_folder_txt"
+   font="SansSerifMedium"
+   text_color="White"
+   width="300">
+   Double-click on folder in multi-folder view:
+ </text>
+ <radio_group
+  control_name="MultiModeDoubleClickOpenWindow"
+  follows="left|top"
+  top_pad="8"
+  layout="topleft"
+  font="SansSerifMedium"
+  left="60"
+  width="325"
+  height="45"
+  name="multi_double_click_setting">
+     <radio_item
+      height="20"
+      label="Expands &amp; collapses folder"
+      label_text.text_color="White"
+      follows="left|top"
+      layout="topleft"
+      name="false"
+      width="200"/>
+     <radio_item
+      height="20"
+      follows="left|top"
+      label="Opens a new window"
+      label_text.text_color="White"
+      layout="topleft"
+      left_delta="0"
+      name="true"
+      top_pad ="5"
+      width="200" />
+ </radio_group>
+ <icon
+  follows="top|left"
+  height="18"
+  image_name="Single_Folder_Mode"
+  layout="topleft"
+  left="18"
+  mouse_opaque="true"
+  name="single_folder_icon"
+  top_pad="30"
+  width="18" />
+ <text
+   type="string"
+   length="1"
+   follows="left|top|right"
+   height="13"
+   layout="topleft"
+   left_pad="12"
+   top_delta="2"
+   name="single_folder_txt"
+   font="SansSerifMedium"
+   text_color="White"
+   width="300">
+   Double-click on folder in single-folder view:
+ </text>
+ <radio_group
+  control_name="SingleModeDoubleClickOpenWindow"
+  follows="left|top"
+  top_pad="8"
+  layout="topleft"
+  font="SansSerifMedium"
+  left="60"
+  width="325"
+  height="45"
+  name="single_double_click_setting">
+     <radio_item
+      height="20"
+      label="Stays in current window"
+      label_text.text_color="White"
+      follows="left|top"
+      layout="topleft"
+      name="false"
+      width="200"/>
+     <radio_item
+      height="20"
+      follows="left|top"
+      label="Opens a new window"
+      label_text.text_color="White"
+      layout="topleft"
+      left_delta="0"
+      name="true"
+      top_pad ="5"
+      width="200" />
+ </radio_group>
+ <text
+   type="string"
+   length="1"
+   follows="left|top|right"
+   height="13"
+   layout="topleft"
+   left="48"
+   name="find_original_txt"
+   font="SansSerifMedium"
+   text_color="White"
+   top_pad="30"
+   width="300">
+   Clicking on "Show in inventory" or "Find original"
+ </text>
+ <radio_group
+  control_name="FindOriginalOpenWindow"
+  follows="left|top"
+  top_pad="8"
+  layout="topleft"
+  font="SansSerifMedium"
+  left="60"
+  width="325"
+  height="45"
+  name="find_original_settings">
+     <radio_item
+      height="20"
+      label="Shows item in main inventory window"
+      label_text.text_color="White"
+      follows="left|top"
+      layout="topleft"
+      name="false"
+      width="200"/>
+     <radio_item
+      height="20"
+      follows="left|top"
+      label="Opens a new single-folder window"
+      label_text.text_color="White"
+      layout="topleft"
+      left_delta="0"
+      name="true"
+      top_pad ="5"
+      width="200" />
+ </radio_group>
+ <button
+  height="20"
+  label="OK"
+  layout="topleft"
+  left="140"
+  bottom="-20"
+  name="ok_btn"
+  label_color="White"
+  width="90" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
index b89ff832b9..c7f9822e41 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -101,12 +101,14 @@
          parameter="single_folder_view" />
     </menu_item_check>
     <menu_item_separator/>
-    <menu_item_call
+    <menu_item_check
      label="Inventory settings..."
-     layout="topleft"
      name="inv_settings">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="inv_settings" />
-    </menu_item_call>
+        <menu_item_check.on_check
+         function="Floater.Visible"
+         parameter="inventory_settings" />
+        <menu_item_check.on_click
+         function="Floater.Toggle"
+         parameter="inventory_settings" />
+    </menu_item_check>
 </toggleable_menu>
-- 
cgit v1.2.3


From 2b56570c6867dc39aa4c8a19d2657ffed6c596b2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 24 Feb 2023 12:51:03 +0200
Subject: SL-19108 Fallback thumbnail

---
 .../default/textures/icons/thumbnail_fallback_icon.png   | Bin 0 -> 6162 bytes
 indra/newview/skins/default/textures/textures.xml        |   1 +
 .../default/xui/en/floater_change_item_thumbnail.xml     |   1 +
 .../newview/skins/default/xui/en/sidepanel_item_info.xml |   1 +
 4 files changed, 3 insertions(+)
 create mode 100644 indra/newview/skins/default/textures/icons/thumbnail_fallback_icon.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/thumbnail_fallback_icon.png b/indra/newview/skins/default/textures/icons/thumbnail_fallback_icon.png
new file mode 100644
index 0000000000..8d5ca624af
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/thumbnail_fallback_icon.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 5d9c362e78..424fc851fd 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -690,6 +690,7 @@ with the same filename but different name
   <texture name="TextField_Active" file_name="widgets/TextField_Active.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
   <texture name="TextField_Search_Highlight" file_name="widgets/TextField_Search_Highlight.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
 
+  <texture name="Thumbnail_Fallback" file_name="icons/thumbnail_fallback_icon.png" preload="true" />
 
   <texture name="Toast_CloseBtn" file_name="windows/Toast_CloseBtn.png" preload="true" />
   <texture name="Toast_Background" file_name="windows/Toast_Background.png" preload="true"
diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index f5c266c553..95e868a696 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -56,6 +56,7 @@
 
   <thumbnail
     name="item_thumbnail"
+    fallback_image="Thumbnail_Fallback"
     follows="top|left"
     layout="topleft"
     left="32"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index f755ec0ec4..ad521cb1af 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -93,6 +93,7 @@
       
       <thumbnail
         name="item_thumbnail"
+        fallback_image="Thumbnail_Fallback"
         follows="top|left"
         layout="topleft"
         left="5"
-- 
cgit v1.2.3


From dd656390c3b6cbdfc6e88c8ff3e6a011238b6f6e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 25 Feb 2023 23:08:38 +0200
Subject: SL-19108 Only permit 64 to 256 px images for thumbnails

---
 .../skins/default/xui/en/floater_change_item_thumbnail.xml    |  9 +++++----
 indra/newview/skins/default/xui/en/notifications.xml          | 11 +++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index 95e868a696..f3f8ee0daa 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -44,14 +44,15 @@
     top="4"
     width="16" />
   <text
-    follows="left|top|right"
+    name="item_name"
     font="SansSerif"
-    height="19"
+    max_length_bytes="127"
+    use_ellipses="true"
+    follows="left|top|right"
     layout="topleft"
+    height="19"
     top_delta="1"
     left_pad="3"
-    max_length_bytes="127"
-    name="item_name"
     width="286"/>
 
   <thumbnail
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ceae31967e..d2d3cb4523 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6109,6 +6109,17 @@ Are you sure you want to delete them?
      yestext="Delete"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ThumbnailDimantionsLimit"
+   type="alertmodal">
+    <unique/>
+    Only square images from 64 to 256 pixels per side are allowed.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
      icon="alertmodal.tga"
      name="ConfirmUnlink"
-- 
cgit v1.2.3


From cb7debd70dc880a9cdeef983dc99281780c5e89a Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 27 Feb 2023 18:02:19 +0200
Subject: SL-19273 Show message when folder is empty or if no search results

---
 indra/newview/skins/default/xui/en/panel_main_inventory.xml | 1 -
 indra/newview/skins/default/xui/en/strings.xml              | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 16ad6f60db..5f6859622d 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -279,7 +279,6 @@
      width="312">
       <single_folder_inventory_panel
        name="single_folder_inv"
-       show_empty_message="false"
        follows="all"
        left="0"
        top="0"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3e6c7f0829..39fcc35580 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2306,6 +2306,8 @@ For AI Character: Get the closest navigable point to the point provided.
 	<string name="FavoritesNoMatchingItems">To add a place to your favorites, click the star to the right of the location name, then save the landmark to "Favorites bar".</string>
 	<string name="MarketplaceNoListing">You have no listings yet.</string>
 	<string name="MarketplaceNoMatchingItems">No items found. Check the spelling of your search string and try again.</string>
+	<string name="InventorySingleFolderEmpty">Folder is empty.</string>
+	<string name="InventorySingleFolderNoMatches">No matches.</string>
 	<string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string>
 	<string name="InventoryInboxNoItems">Your Marketplace purchases will appear here. You may then drag them into your inventory to use them.</string>
 	<string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string>
-- 
cgit v1.2.3


From f377e27f0b8ddabf755c6efe71d6bc0e53e751c1 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 27 Feb 2023 20:27:11 +0200
Subject: SL-19274 Add new double-click option to Inventory settings

---
 .../default/xui/en/floater_inventory_settings.xml  | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
index c3e81a5523..bfac79ac46 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
@@ -4,10 +4,10 @@
  can_minimize="true"
  can_resize="false"
  save_rect="true"
- height="350"
+ height="370"
  width="370"
  name="inventory_settings"
- title="Inventory settings">
+ title="INVENTORY SETTINGS">
  <icon
   follows="top|left"
   height="18"
@@ -33,14 +33,14 @@
    Double-click on folder in multi-folder view:
  </text>
  <radio_group
-  control_name="MultiModeDoubleClickOpenWindow"
+  control_name="MultiModeDoubleClickFolder"
   follows="left|top"
   top_pad="8"
   layout="topleft"
   font="SansSerifMedium"
   left="60"
-  width="325"
-  height="45"
+  width="300"
+  height="70"
   name="multi_double_click_setting">
      <radio_item
       height="20"
@@ -48,7 +48,7 @@
       label_text.text_color="White"
       follows="left|top"
       layout="topleft"
-      name="false"
+      name="0"
       width="200"/>
      <radio_item
       height="20"
@@ -57,7 +57,17 @@
       label_text.text_color="White"
       layout="topleft"
       left_delta="0"
-      name="true"
+      name="1"
+      top_pad ="5"
+      width="200" />
+     <radio_item
+      height="20"
+      follows="left|top"
+      label="Switch view"
+      label_text.text_color="White"
+      layout="topleft"
+      left_delta="0"
+      name="2"
       top_pad ="5"
       width="200" />
  </radio_group>
@@ -92,7 +102,7 @@
   layout="topleft"
   font="SansSerifMedium"
   left="60"
-  width="325"
+  width="300"
   height="45"
   name="single_double_click_setting">
      <radio_item
@@ -135,7 +145,7 @@
   layout="topleft"
   font="SansSerifMedium"
   left="60"
-  width="325"
+  width="300"
   height="45"
   name="find_original_settings">
      <radio_item
-- 
cgit v1.2.3


From ba1872e57106c7a27a0f73453ace499f42c48345 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 28 Feb 2023 02:32:23 +0200
Subject: =?UTF-8?q?SL-19271=20Remove=20=E2=80=98New=20folder=20window?=
 =?UTF-8?q?=E2=80=99,=20=E2=80=98Open=20in=20new=20window=E2=80=99=20and?=
 =?UTF-8?q?=20=E2=80=98Open=E2=80=99=20from=20Gear=20menu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/xui/en/menu_inventory_gear_default.xml | 31 ----------------------
 indra/newview/skins/default/xui/en/menu_viewer.xml |  9 -------
 2 files changed, 40 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index f778742ed9..d2bd33a44c 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -6,37 +6,6 @@
  mouse_opaque="false"
  name="menu_gear_default"
  visible="false">
-    <menu_item_call
-     label="Open"
-     layout="topleft"
-     name="open_in_current_window">
-       <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="open_in_current_window" />
-        <on_visible
-         function="Inventory.GearDefault.Visible"
-         parameter="open_folder" />
-    </menu_item_call>
-    <menu_item_call
-     label="Open in new window"
-     layout="topleft"
-     name="open_in_new_window">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="open_in_new_window" />
-        <on_visible
-         function="Inventory.GearDefault.Visible"
-         parameter="open_new_folder" />
-    </menu_item_call>
-    <menu_item_call
-     label="New Folder Window"
-     layout="topleft"
-     shortcut="control|shift|J"
-     name="new_single_folder">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="new_single_folder_window" />
-    </menu_item_call>
     <menu_item_call
      label="New Inventory Window"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index de11a2c0e9..58584345a9 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -36,15 +36,6 @@
          function="Inventory.NewWindow"
          parameter="" />
       </menu_item_call>
-      <menu_item_call
-       label="New Folder Window"
-       name="new_single_folder"
-       shortcut="control|shift|J"
-       visible="false">
-        <menu_item_call.on_click
-         function="Inventory.NewFolderWindow"
-         parameter="" />
-      </menu_item_call>
       <menu_item_call
        label="Places..."
        name="Places"
-- 
cgit v1.2.3


From 46531cea8475741f9144f787fec8be371de082e6 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 28 Feb 2023 14:35:44 +0200
Subject: SL-19285 Add 'Close all windows' to Gear menu

---
 indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index d2bd33a44c..50e24824fe 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -16,7 +16,7 @@
          parameter="new_window" />
     </menu_item_call>
     <menu_item_call
-     label="Close All Folders"
+     label="Collapse All Folders"
      layout="topleft"
      name="close_folders">
         <on_click
-- 
cgit v1.2.3


From 7589b674f512609cb33c53587038c4e29572c1cd Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 28 Feb 2023 19:14:15 +0200
Subject: SL-19288 Change link color to white

---
 indra/newview/skins/default/xui/en/panel_main_inventory.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 5f6859622d..2eda9d385b 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -286,6 +286,7 @@
        height="372"
        width="312"
        layout="topleft"
+       show_item_link_overlays="true"
        bg_opaque_color="DkGray2"
        bg_alpha_color="DkGray2"
        background_visible="true"
-- 
cgit v1.2.3


From e4fa03a24635133c980c07b5b2483abbad52f66d Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 1 Mar 2023 19:30:44 +0200
Subject: SL-19301 Reduce Inventory minimum height and reduce items indentation
 in SFV

---
 indra/newview/skins/default/xui/en/floater_my_inventory.xml       | 2 +-
 .../newview/skins/default/xui/en/menu_inventory_gear_default.xml  | 8 ++++++++
 indra/newview/skins/default/xui/en/panel_main_inventory.xml       | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
index 1b4f323d04..a9900f05b7 100644
--- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -6,7 +6,7 @@
  height="570"
  help_topic="sidebar_inventory"
  min_width="363"
- min_height="590"
+ min_height="270"
  name="floater_my_inventory"
  save_rect="true"
  save_visibility="true"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index 50e24824fe..5032505487 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -26,6 +26,14 @@
          function="Inventory.GearDefault.Visible"
          parameter="multi_folder_view" />
     </menu_item_call>
+    <menu_item_call
+     label="Close All Windows"
+     layout="topleft"
+     name="close_windows">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="close_inv_windows" />
+    </menu_item_call>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 2eda9d385b..9086f38893 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -293,10 +293,10 @@
        border="false"
        bevel_style="none"
        scroll.reserve_scroll_corner="false">
-        <item folder_indentation="0"/>
+        <item folder_indentation="-8"/>
         <folder
          single_folder_mode="true"
-         folder_indentation="0"/>
+         folder_indentation="-8"/>
       </single_folder_inventory_panel>
     </panel>
 </panel>
-- 
cgit v1.2.3


From 4d2bdbb05ac24b4121f05107399fa7be33539f74 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 1 Mar 2023 23:37:05 +0200
Subject: SL-19282 Removed LLInspectTexture floater

LLInspectTexture floater appears to be incomplete and doesn't have a function
---
 .../skins/default/xui/en/inspect_texture.xml       | 63 ----------------------
 1 file changed, 63 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/inspect_texture.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/inspect_texture.xml b/indra/newview/skins/default/xui/en/inspect_texture.xml
deleted file mode 100644
index 30be90cfa0..0000000000
--- a/indra/newview/skins/default/xui/en/inspect_texture.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater
- legacy_header_height="25"
- bevel_style="in"
- bg_opaque_image="Inspector_Background" 
- can_close="false"
- can_minimize="false"
- height="295"
- layout="topleft"
- name="inspect_texture"
- single_instance="true"
- sound_flags="0"
- visible="true"
- width="250">
-  <texture_picker
-   enabled="false"
-   fallback_image="default_land_picture.j2c"
-   follows="all"
-   height="262"
-   layout="topleft"
-   left="5"
-   name="texture_ctrl"
-   top_pad="5"
-   width="240" />
-  <text
-   follows="top|left"
-   font="SansSerifSmall"
-   height="16"
-   left="7"
-   name="texture_name"
-   parse_urls="false"
-   right="-7"
-   top_delta="244"
-   text_color="White"
-   translate="false"
-   use_ellipses="true"
-   word_wrap="true"
-   value="Name of the texture goes here" />
-  <button
-   bottom="-5"
-   follows="bottom|left"
-   height="23"
-   label="Open"
-   left="7"
-   name="open_btn"
-   width="115"
-   commit_callback.function="InspectTexture.Open"
-   enable_callback.function="InspectTexture.CanOpen" />
-  <button
-   bottom="-5"
-   follows="bottom|left"
-   height="23"
-   label="Copy to Inventory"
-   left_pad="5"
-   name="copy_btn"
-   width="115"
-   commit_callback.function="InspectTexture.CopyToInv"
-   enable_callback.function="InspectTexture.CanCopyToInv" />
-</floater>
-- 
cgit v1.2.3


From c74658b19b1ac28d5bf240e940a7ad97ff034e3c Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 2 Mar 2023 20:54:33 +0200
Subject: SL-19310 Update navigation buttons in single-folder view

---
 indra/newview/skins/default/xui/en/panel_main_inventory.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 9086f38893..d400835198 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -293,7 +293,9 @@
        border="false"
        bevel_style="none"
        scroll.reserve_scroll_corner="false">
-        <item folder_indentation="-8"/>
+        <item
+         single_folder_mode="true"
+         folder_indentation="-8"/>
         <folder
          single_folder_mode="true"
          folder_indentation="-8"/>
-- 
cgit v1.2.3


From 783a802abc63efd3b55d5b38c76c03d87d47bf75 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 8 Mar 2023 02:41:11 +0200
Subject: SL-19359 Show Received Items panel in all new Inventory floaters

---
 indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index a4b7f48c5e..dfd3e3bf9d 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -57,7 +57,7 @@
                  user_resize="true"
                  follows="left|right|top"
                  name="inbox_layout_panel"
-                 visible="false"
+                 visible="true"
                  min_dim="35"
                  expanded_min_dim="90"
                  height="235">
-- 
cgit v1.2.3


From 3c54d6a0371377f65c8eaa7eafffee0decdf4cbf Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 13 Mar 2023 12:40:52 +0200
Subject: SL-19386 Double click to open Single folder view should affect only
 Inventory

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index d400835198..af4511a92d 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -235,7 +235,9 @@
          sort_order_setting="InventorySortOrder"
          show_item_link_overlays="true"
          top="16"
-         width="288" />
+         width="288">
+            <folder double_click_override="true"/>
+        </inventory_panel>
         <recent_inventory_panel
          bg_opaque_color="DkGray2"
          bg_alpha_color="DkGray2"
@@ -250,7 +252,9 @@
          left_delta="0"
          name="Recent Items"
          show_item_link_overlays="true"
-         width="290" />
+         width="290">
+            <folder double_click_override="true"/>
+        </recent_inventory_panel>
         <inventory_panel
          name="Worn Items"
          label="WORN"
@@ -264,6 +268,7 @@
          border="false"
          bevel_style="none"
          scroll.reserve_scroll_corner="false">
+            <folder double_click_override="true"/>
         </inventory_panel>
       </tab_container>
     </panel>
-- 
cgit v1.2.3


From 1eab3247111e66a3b81153173d1624a5c1c9fb72 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 21 Mar 2023 17:47:26 +0200
Subject: SL-19379 WIP Gallery view Inventory: first pass

---
 .../default/xui/en/menu_inventory_view_default.xml |  1 +
 .../default/xui/en/panel_inventory_gallery.xml     | 37 +++++++++++++
 .../xui/en/panel_inventory_gallery_item.xml        | 63 ++++++++++++++++++++++
 .../skins/default/xui/en/panel_main_inventory.xml  | 23 ++++++++
 4 files changed, 124 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
index c7f9822e41..28ec8f2bf1 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -89,6 +89,7 @@
     <menu_item_check
      label="Combination view"
      layout="topleft"
+     enabled="false"
      name="combination_view">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
new file mode 100644
index 0000000000..68f78a77c8
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+   background_visible="true"
+   bg_alpha_color="DkGray"
+   border="false"
+   follows="all"
+   height="390"
+   name="Inventory Gallery"
+   layout="topleft"
+   left="0"
+   top="0"
+   width="404">
+  <text
+    type="string"
+    clip_partial="false"
+    follows="left|top"
+    layout="topleft"
+    left="13"
+    name="empty_txt"
+    top="0"
+    height="32"
+    valign="center"
+    parse_urls="true"
+    wrap="true">
+    Folder is empty.
+  </text> 
+  <scroll_container
+   follows="all"
+   height="400"
+   layout="topleft"
+   left="4"
+   top="0"
+   name="gallery_scroll_panel"
+   opaque="false"
+   top_pad="0">
+  </scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
new file mode 100644
index 0000000000..80beb2ec8a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+   background_visible="false"
+   background_opaque="false"
+   bg_alpha_color="FrogGreen"
+   bg_opaque_color="FrogGreen"   
+   border="false"
+   bevel_style="none"
+   follows="left|top"
+   height="149"
+   width="130"
+   name="gallery_item_panel"
+   layout="topleft"
+   left="0"
+   top="0">
+  <thumbnail
+   name="preview_thumbnail"
+   image_name="Thumbnail_Fallback"
+   layout="topleft"
+   follows="left|top"
+   interactable="false"
+   height="128"
+   width="128"
+   top="0"
+   left="1"/>
+  <icon
+   left="5"
+   top_pad="-25"
+   layout="topleft"
+   name="item_type"
+   height="20"
+   width="20"
+   follows="left|top"
+   visible="true"
+   image_name="Inv_Eye"/>
+  <panel
+   background_visible="false"
+   background_opaque="true"
+   bg_opaque_color="MenuItemHighlightBgColor"
+   border="false"
+   bevel_style="none"
+   follows="left|top"
+   left="0"
+   top="129"
+   height="25"
+   width="148"
+   name="text_bg_panel">
+    <text
+      read_only="true"
+      length="1"
+      follows="left|top"
+      left="1"
+      height="10"
+      layout="topleft"
+      name="item_name"
+      parse_urls="false"
+      top="2"
+      width="150"
+      use_ellipses="true">
+      Item name, folder name.
+    </text>
+  </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index af4511a92d..3cdb3c5003 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -306,4 +306,27 @@
          folder_indentation="-8"/>
       </single_folder_inventory_panel>
     </panel>
+    <panel
+     follows="all"
+     halign="center"
+     height="372"
+     layout="topleft"
+     left="7"
+     name="gallery_view_inventory"
+     top_delta="0"
+     visible="false"
+     width="312">
+      <panel
+       class="inventory_gallery"
+       filename="panel_inventory_gallery.xml"
+       left="0"
+       top="0"
+       height="372"
+       width="312"
+       name="gallery_view_inv"
+       background_visible="true"
+       follows="all"
+       layout="topleft" />
+      </panel>
+    </panel>
 </panel>
-- 
cgit v1.2.3


From d6a11416ec524420b6a6ac298b7b093cb24e9ec9 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 22 Mar 2023 01:20:22 +0200
Subject: SL-19379 WIP handle updated thumbnails in Gallery mode

---
 indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml | 6 +++---
 indra/newview/skins/default/xui/en/panel_main_inventory.xml         | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index 80beb2ec8a..c180024aa7 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -25,11 +25,11 @@
    left="1"/>
   <icon
    left="5"
-   top_pad="-25"
+   top_pad="-21"
    layout="topleft"
    name="item_type"
-   height="20"
-   width="20"
+   height="16"
+   width="16"
    follows="left|top"
    visible="true"
    image_name="Inv_Eye"/>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 3cdb3c5003..d670161e00 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -327,6 +327,5 @@
        background_visible="true"
        follows="all"
        layout="topleft" />
-      </panel>
     </panel>
 </panel>
-- 
cgit v1.2.3


From 6172945775790757af827dfb88251875b0dd446f Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 23 Mar 2023 13:56:42 +0200
Subject: SL-19391 FIXED SFV floater title displays unlocalised name for system
 folders

---
 indra/newview/skins/default/xui/de/panel_main_inventory.xml | 1 +
 indra/newview/skins/default/xui/es/panel_main_inventory.xml | 1 +
 indra/newview/skins/default/xui/fr/panel_main_inventory.xml | 1 +
 indra/newview/skins/default/xui/it/panel_main_inventory.xml | 1 +
 indra/newview/skins/default/xui/ja/panel_main_inventory.xml | 1 +
 indra/newview/skins/default/xui/pl/panel_main_inventory.xml | 1 +
 indra/newview/skins/default/xui/pt/panel_main_inventory.xml | 1 +
 indra/newview/skins/default/xui/ru/panel_main_inventory.xml | 1 +
 indra/newview/skins/default/xui/tr/panel_main_inventory.xml | 1 +
 indra/newview/skins/default/xui/zh/panel_main_inventory.xml | 1 +
 10 files changed, 10 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/panel_main_inventory.xml b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
index a3adea9fa2..175f6e1003 100644
--- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		Geholte [ITEM_COUNT] Bestellungen und [CATEGORY_COUNT] Ordner [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">INVENTAR</panel.string>
 	<text name="ItemcountText">
 		Objekte:
 	</text>
diff --git a/indra/newview/skins/default/xui/es/panel_main_inventory.xml b/indra/newview/skins/default/xui/es/panel_main_inventory.xml
index 1252c7ce0d..bf1205046b 100644
--- a/indra/newview/skins/default/xui/es/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/es/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		[ITEM_COUNT] Objetos y [CATEGORY_COUNT] Carpetas Obtenidos [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">INVENTARIO</panel.string>
 	<text name="ItemcountText">
 		Ítems:
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
index 5bcee89752..5bf4d6c15d 100644
--- a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		Recherche effectuée [ITEM_COUNT] d&apos;articles et [CATEGORY_COUNT] de dossiers [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">INVENTAIRE</panel.string>
 	<text name="ItemcountText">
 		Articles :
 	</text>
diff --git a/indra/newview/skins/default/xui/it/panel_main_inventory.xml b/indra/newview/skins/default/xui/it/panel_main_inventory.xml
index 5d11967cee..d6890229e7 100644
--- a/indra/newview/skins/default/xui/it/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		Recuperati [ITEM_COUNT] oggetti e [CATEGORY_COUNT] cartelle [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">INVENTARIO</panel.string>
 	<text name="ItemcountText">
 		Oggetti:
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
index 5751154163..e1f0c4ecc1 100644
--- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		[ITEM_COUNT] 個のアイテムと [CATEGORY_COUNT] 個のフォルダーを取得しました [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">インベントリ</panel.string>
 	<text name="ItemcountText">
 		アイテム：
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
index dc254e246f..1011c38378 100644
--- a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
@@ -6,6 +6,7 @@
 	<panel.string name="ItemcountCompleted">
 		[ITEM_COUNT] obiekty [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">MOJA SZAFA</panel.string>
 	<text name="ItemcountText">
 		Obiekty:
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
index 009b5b3193..e0cf528468 100644
--- a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		Itens [ITEM_COUNT] e Pastas [CATEGORY_COUNT] Reunidos [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">INVENTÁRIO</panel.string>
 	<text name="ItemcountText">
 		Itens:
 	</text>
diff --git a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
index f2502bf6d3..b473fb8f98 100644
--- a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		Выборка [ITEM_COUNT] предметов и [CATEGORY_COUNT] папок [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">ИНВЕНТАРЬ</panel.string>
 	<text name="ItemcountText">
 		Вещи:
 	</text>
diff --git a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
index a11fd98b9a..7e98078635 100644
--- a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		[ITEM_COUNT] Öğe ve [CATEGORY_COUNT] Klasör Alındı [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">ENVANTER</panel.string>
 	<text name="ItemcountText">
 		Ögeler:
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
index 1a28f4c3b5..9ffa9323cc 100644
--- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		擷取了[ITEM_COUNT]個物項及[CATEGORY_COUNT]個資料夾[FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">收納區</panel.string>
 	<text name="ItemcountText">
 		物品：
 	</text>
-- 
cgit v1.2.3


From d733ee60ea1d7cd7a9259c188b7b942a41d24460 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 24 Mar 2023 12:56:57 +0200
Subject: SL-19379 WIP add double-click attach action for objects; add icon
 link overlays

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index c180024aa7..73889af71a 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -33,6 +33,16 @@
    follows="left|top"
    visible="true"
    image_name="Inv_Eye"/>
+  <icon
+    left="5"
+    top_pad="-8"
+    layout="topleft"
+    name="link_overlay"
+    height="8"
+    width="6"
+    follows="left|top"
+    visible="false"
+    image_name="Inv_Link"/>
   <panel
    background_visible="false"
    background_opaque="true"
-- 
cgit v1.2.3


From e5b8b799cc75f3b9cd259403c323cd47b59453d8 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 29 Mar 2023 13:51:40 +0300
Subject: SL-19379 WIP add basic context menu

---
 .../default/xui/en/menu_gallery_inventory.xml      | 531 +++++++++++++++++++++
 .../newview/skins/default/xui/en/notifications.xml |  23 +
 .../default/xui/en/panel_inventory_gallery.xml     |   2 +-
 .../xui/en/panel_inventory_gallery_item.xml        |   4 +-
 4 files changed, 557 insertions(+), 3 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_gallery_inventory.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
new file mode 100644
index 0000000000..15466e8f32
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -0,0 +1,531 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+    layout="topleft"
+    name="Gallery">
+    <menu_item_call
+     label="Share"
+     layout="topleft"
+     name="Share">
+        <menu_item_call.on_click
+         function="Inventory.Share" />
+    </menu_item_call>
+    <menu_item_call
+     label="Empty Trash"
+     layout="topleft"
+     name="Empty Trash">
+        <menu_item_call.on_click
+         function="Inventory.EmptyTrash"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Empty Lost And Found"
+     layout="topleft"
+     name="Empty Lost And Found">
+        <menu_item_call.on_click
+         function="Inventory.EmptyLostAndFound"/>
+    </menu_item_call>
+    <menu_item_call
+     label="New Folder"
+     layout="topleft"
+     name="New Folder">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="category" />
+    </menu_item_call>
+    <menu_item_call
+     label="New Outfit"
+     layout="topleft"
+     name="New Outfit">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="outfit" />
+    </menu_item_call>
+    <menu_item_call
+     label="Teleport"
+     layout="topleft"
+     name="Landmark Open">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="open" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="Folder Wearables Separator" />
+    <menu_item_call
+     label="Replace Current Outfit"
+     layout="topleft"
+     name="Replace Outfit">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="replaceoutfit" />
+    </menu_item_call>
+    <menu_item_call
+     label="Add To Current Outfit"
+     layout="topleft"
+     name="Add To Outfit">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="addtooutfit" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove From Current Outfit"
+     layout="topleft"
+     name="Remove From Outfit">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="removefromoutfit" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy outfit list to clipboard"
+     layout="topleft"
+     name="Copy outfit list to clipboard">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="copyoutfittoclipboard" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="Outfit Separator" />
+    <menu_item_call
+     label="Find Original"
+     layout="topleft"
+     name="Find Original">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="goto" />
+    </menu_item_call>
+    <menu_item_call
+     label="Purge Item"
+     layout="topleft"
+     name="Purge Item">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="purge"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Restore Item"
+     layout="topleft"
+     name="Restore Item">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="restore" />
+    </menu_item_call>
+    <menu_item_call
+     label="Open"
+     layout="topleft"
+     name="Open">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="open" />
+    </menu_item_call>
+    <menu_item_call
+     label="Open Original"
+     layout="topleft"
+     name="Open Original">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="open_original" />
+    </menu_item_call>
+    <menu_item_call
+     label="Properties"
+     layout="topleft"
+     name="Properties">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="properties" />
+    </menu_item_call>
+    <menu_item_call
+     label="Image..."
+     layout="topleft"
+     name="thumbnail">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="thumbnail" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy Asset UUID"
+     layout="topleft"
+     name="Copy Asset UUID">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="copy_uuid" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Copy Separator" />
+    <menu_item_call
+     label="Open"
+     layout="topleft"
+     name="open_in_current_window">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="open_selected_folder" />
+    </menu_item_call>
+    <menu_item_call
+     label="Open in new window"
+     layout="topleft"
+     name="open_in_new_window">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="open_in_new_window" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="Open Folder Separator" />
+    <menu_item_call
+     label="Rename"
+     layout="topleft"
+     name="Rename">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="rename" />
+    </menu_item_call>
+    <menu_item_call
+     label="Cut"
+     layout="topleft"
+     name="Cut">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="cut" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy"
+     layout="topleft"
+     name="Copy">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste"
+     layout="topleft"
+     name="Paste">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="paste" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste As Link"
+     layout="topleft"
+     name="Paste As Link">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="paste_link" />
+    </menu_item_call>
+    <menu_item_call
+     label="Replace Links"
+     layout="topleft"
+     name="Replace Links">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="replace_links" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Paste Separator" />
+    <menu_item_call
+     label="Delete"
+     layout="topleft"
+     name="Delete">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="delete" />
+    </menu_item_call>
+    <menu_item_call
+     label="Delete System Folder"
+     layout="topleft"
+     name="Delete System Folder">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="delete_system_folder" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Play"
+     layout="topleft"
+     name="Sound Play">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="sound_play" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="Landmark Separator" />
+    <menu_item_call
+    label="Copy SLurl"
+    layout="topleft"
+    name="url_copy">
+       <menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="copy_slurl" />
+   </menu_item_call> 
+   <menu_item_call
+     label="About Landmark"
+     layout="topleft"
+     name="About Landmark">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="about" />
+    </menu_item_call>
+   <menu_item_call
+     label="Show on Map"
+     layout="topleft"
+     name="show_on_map">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="show_on_map" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Animation Separator" />
+    <menu_item_call
+     label="Play Inworld"
+     layout="topleft"
+     name="Animation Play">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="playworld" />
+    </menu_item_call>
+    <menu_item_call
+     label="Play Locally"
+     layout="topleft"
+     name="Animation Audition">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="playlocal" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Send Instant Message Separator" />
+    <menu_item_call
+     label="Send Instant Message"
+     layout="topleft"
+     name="Send Instant Message">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="begin_im" />
+    </menu_item_call>
+    <menu_item_call
+     label="Offer Teleport..."
+     layout="topleft"
+     name="Offer Teleport...">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="lure" />
+    </menu_item_call>
+    <menu_item_call
+     label="Request Teleport..."
+     layout="topleft"
+     name="Request Teleport...">
+        <menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="request_lure" />
+    </menu_item_call>
+    <menu_item_call
+     label="Start Conference Chat"
+     layout="topleft"
+     name="Conference Chat">
+        <menu_item_call.on_click
+         function="Inventory.BeginIMSession"
+         parameter="selected" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Gesture Separator" />
+    <menu_item_call
+     label="Activate"
+     layout="topleft"
+     name="Activate">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="activate" />
+    </menu_item_call>
+    <menu_item_call
+     label="Deactivate"
+     layout="topleft"
+     name="Deactivate">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="deactivate" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Texture Separator" />
+    <menu_item_call
+     label="Save As"
+     layout="topleft"
+     name="Save As">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="save_as" />
+    </menu_item_call>
+  <menu_item_call
+ label="Save Selected As"
+ layout="topleft"
+ name="Save Selected As">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="save_selected_as" />
+  </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Wearable And Object Separator"/>
+    <menu_item_call
+     label="Wear"
+     layout="topleft"
+     name="Wearable And Object Wear">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="wear" />
+    </menu_item_call>
+    <menu
+     label="Attach To"
+     layout="topleft"
+     name="Attach To" />
+    <menu
+     label="Attach To HUD"
+     layout="topleft"
+     name="Attach To HUD" />
+    <menu_item_call
+     label="Touch"
+     layout="topleft"
+     name="Attachment Touch">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="touch" />
+    </menu_item_call>
+    <menu_item_call
+     label="Edit"
+     layout="topleft"
+     name="Wearable Edit">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="edit" />
+    </menu_item_call>
+    <menu_item_call
+     label="Add"
+     layout="topleft"
+     name="Wearable Add">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="wear_add" />
+    </menu_item_call>
+    <menu_item_call
+     label="Detach From Yourself"
+     layout="topleft"
+     name="Detach From Yourself">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="detach" />
+    </menu_item_call>
+    <menu_item_call
+     label="Take Off"
+     layout="topleft"
+     name="Take Off">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="take_off" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Settings Separator" />
+    <menu_item_call
+            name="Settings Apply Local"
+            layout="topleft"
+            label="Apply Only To Myself">
+        <menu_item_call.on_click 
+                function="Inventory.DoToSelected"
+                parameter="apply_settings_local" />
+    </menu_item_call>
+    <menu_item_call
+            name="Settings Apply Parcel"
+            layout="topleft"
+            label="Apply To Parcel">
+        <menu_item_call.on_click 
+                function="Inventory.DoToSelected"
+                parameter="apply_settings_parcel" />
+    </menu_item_call>
+  <menu_item_separator
+   layout="topleft"
+   name="Subfolder Separator" />
+  <menu_item_call
+   label="Create folder from selected"
+   layout="topleft"
+   name="New folder from selected">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="new_folder_from_selected" />
+  </menu_item_call>
+  <menu_item_call
+   label="Ungroup folder items"
+   layout="topleft"
+   name="Ungroup folder items">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="ungroup_folder_items" />
+  </menu_item_call>
+  <menu
+   label="Use as default for"
+   layout="topleft"
+   name="upload_def">
+    <menu_item_call
+     label="Image uploads"
+     layout="topleft"
+     name="Image uploads">
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+        parameter="texture" />
+    </menu_item_call>
+    <menu_item_call
+     label="Sound uploads"
+     layout="topleft"
+     name="Sound uploads">
+    <menu_item_call.on_click
+     function="Inventory.FileUploadLocation"
+     parameter="sound" />
+    </menu_item_call>
+    <menu_item_call
+     label="Animation uploads"
+     layout="topleft"
+     name="Animation uploads">
+    <menu_item_call.on_click
+     function="Inventory.FileUploadLocation"
+     parameter="animation" />
+    </menu_item_call>
+    <menu_item_call
+     label="Model uploads"
+     layout="topleft"
+     name="Model uploads">
+    <menu_item_call.on_click
+     function="Inventory.FileUploadLocation"
+     parameter="model" />
+    </menu_item_call>
+  </menu>
+	<menu_item_separator
+	 layout="topleft"
+	 name="Marketplace Separator" />
+	<menu_item_call
+        label="Copy to Marketplace Listings"
+        layout="topleft"
+        name="Marketplace Copy">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="copy_to_marketplace_listings" />
+	</menu_item_call>
+	<menu_item_call
+        label="Move to Marketplace Listings"
+        layout="topleft"
+        name="Marketplace Move">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="move_to_marketplace_listings" />
+	</menu_item_call>
+	<menu_item_call
+     label="--no options--"
+     layout="topleft"
+     name="--no options--" />
+    <menu_item_separator
+     layout="topleft" />
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d2d3cb4523..70edd567a1 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3247,6 +3247,29 @@ See https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
     </form>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   label="Rename Selected Item"
+   name="RenameItem"
+   type="alertmodal">
+    Choose a new name for [NAME]
+   <tag>confirm</tag>
+    <form name="form">
+    <input name="new_name" type="text" width="300">
+      [NAME]
+    </input>
+    <button
+     default="true"
+     index="0"
+     name="OK"
+     text="OK"/>
+    <button
+     index="1"
+     name="Cancel"
+     text="Cancel"/>
+   </form>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="RemoveFromFriends"
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
index 68f78a77c8..b32d592bf6 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
@@ -26,7 +26,7 @@
   </text> 
   <scroll_container
    follows="all"
-   height="400"
+   height="390"
    layout="topleft"
    left="4"
    top="0"
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index 73889af71a..1d216df094 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -53,7 +53,7 @@
    left="0"
    top="129"
    height="25"
-   width="148"
+   width="130"
    name="text_bg_panel">
     <text
       read_only="true"
@@ -65,7 +65,7 @@
       name="item_name"
       parse_urls="false"
       top="2"
-      width="150"
+      width="130"
       use_ellipses="true">
       Item name, folder name.
     </text>
-- 
cgit v1.2.3


From 05a4485082b07208a3b5b8d5c2070243cb237e42 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 29 Mar 2023 19:43:19 +0300
Subject: SL-19504 Allow using inventory items as thumbnails from clipboard

---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 70edd567a1..0ea13e7d63 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6134,7 +6134,7 @@ Are you sure you want to delete them?
 
   <notification
    icon="alertmodal.tga"
-   name="ThumbnailDimantionsLimit"
+   name="ThumbnailDimentionsLimit"
    type="alertmodal">
     <unique/>
     Only square images from 64 to 256 pixels per side are allowed.
-- 
cgit v1.2.3


From 8ed39a469b1b7337855c113f785fb64e66cf3b8f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 29 Mar 2023 21:30:46 +0300
Subject: SL-19504 Allow drag and drop of textures into thumbnail floater

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0ea13e7d63..73ce5a6096 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6143,6 +6143,17 @@ Are you sure you want to delete them?
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ThumbnailInsufficientPermissions"
+   type="alertmodal">
+    <unique/>
+    Only copy and transfer free images can be assigned as thumbnails.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
      icon="alertmodal.tga"
      name="ConfirmUnlink"
-- 
cgit v1.2.3


From 0d068b0f3080a3378b54d508029bbc11e262aa2f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 29 Mar 2023 22:56:48 +0300
Subject: SL-19479 Remove outfit photo preview and replace with a pop up

---
 .../xui/en/floater_outfit_photo_preview.xml        | 65 ----------------------
 .../newview/skins/default/xui/en/notifications.xml | 11 ++++
 2 files changed, 11 insertions(+), 65 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_outfit_photo_preview.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_outfit_photo_preview.xml b/indra/newview/skins/default/xui/en/floater_outfit_photo_preview.xml
deleted file mode 100644
index bfc1c39e9d..0000000000
--- a/indra/newview/skins/default/xui/en/floater_outfit_photo_preview.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="false"
- height="325"
- layout="topleft"
- name="outfit_photo_preview"
- help_topic="preview_texture"
- width="410">
-   <floater.string
-     name="Title">
-        Texture: [NAME]
-    </floater.string>
-    <floater.string
-     name="exceed_limits">
-        Max outfit photo size is [MAX_WIDTH]*[MAX_HEIGHT]. Please select another texture.
-    </floater.string>
-    <floater.string
-     name="photo_confirmation">
-         Set this as Outfit Photo for [OUTFIT]?
-    </floater.string>
-    <text
-     type="string"
-     halign="right"
-     length="1"
-     follows="right|bottom"
-     height="16"
-     layout="topleft"
-     left="110"
-     name="dimensions"
-     top="255"
-     width="200">
-        [WIDTH]px x [HEIGHT]px
-    </text>
-    <text
-     type="string"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     name="notification"
-     left="25"
-     halign="center"
-     top_pad="5"
-     width="360">
-    </text>
-    <button
-     follows="right|bottom"
-     height="22"
-     label="OK"
-     layout="topleft"
-     name="ok_btn"
-     top_pad="5"
-     right="-115"
-     top_delta="0"
-     width="90" />
-    <button
-     follows="right|bottom"
-     height="22"
-     label="Cancel"
-     layout="topleft"
-     name="cancel_btn"
-     right="-20"
-     top_delta="0"
-     width="90" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 73ce5a6096..e6f670aa39 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6154,6 +6154,17 @@ Are you sure you want to delete them?
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ThumbnailOutfitPhoto"
+   type="alertmodal">
+    <unique/>
+    To add an image to an outfit, use the Outfit Gallery window, or right-click on the outfit folder and select "Image..."
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
      icon="alertmodal.tga"
      name="ConfirmUnlink"
-- 
cgit v1.2.3


From c15ee792a7248cf141abb3ae6a26b33a5aca1ed7 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 30 Mar 2023 15:04:49 +0300
Subject: SL-19379 WIP allow hide link items in search result

---
 indra/newview/skins/default/xui/en/notifications.xml                | 3 ++-
 indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e6f670aa39..e8a19d3f1f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3252,7 +3252,8 @@ See https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
    label="Rename Selected Item"
    name="RenameItem"
    type="alertmodal">
-    Choose a new name for [NAME]
+    Choose a new name for:
+[NAME]
    <tag>confirm</tag>
     <form name="form">
     <input name="new_name" type="text" width="300">
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index 1d216df094..281604503f 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -65,7 +65,7 @@
       name="item_name"
       parse_urls="false"
       top="2"
-      width="130"
+      width="127"
       use_ellipses="true">
       Item name, folder name.
     </text>
-- 
cgit v1.2.3


From ae3e3662159ca26db5b2efe36d91a9ccdfcec256 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 30 Mar 2023 21:39:43 +0300
Subject: SL-19379 WIP update gear menu with Gallery items

---
 indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index 5032505487..2c630880c2 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -69,7 +69,8 @@
      name="Share"
      visible="true">
      <on_click
-         function="Inventory.Share" />
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="share" />
      <on_enable
          function="Inventory.GearDefault.Enable"
          parameter="share" />
-- 
cgit v1.2.3


From 81d69cf84decb84bb7d65057063a19cb6c9fa6f5 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 31 Mar 2023 13:40:59 +0300
Subject: SL-19379 WIP add worn suffix, use bold font style for worn items and
 italic for links

---
 .../skins/default/xui/en/panel_inventory_gallery_item.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index 281604503f..05a02158c0 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -13,6 +13,7 @@
    layout="topleft"
    left="0"
    top="0">
+  <string name="worn_string">(worn)</string>
   <thumbnail
    name="preview_thumbnail"
    image_name="Thumbnail_Fallback"
@@ -64,10 +65,24 @@
       layout="topleft"
       name="item_name"
       parse_urls="false"
+      text_readonly_color="White"
       top="2"
       width="127"
       use_ellipses="true">
       Item name, folder name.
     </text>
+    <text
+      read_only="true"
+      length="1"
+      follows="left|top"
+      left="1"
+      height="10"
+      layout="topleft"
+      name="suffix_text"
+      text_readonly_color="InventoryItemLinkColor"
+      top="13"
+      width="127">
+      (worn)
+    </text>
   </panel>
 </panel>
-- 
cgit v1.2.3


From 29c5bf19f706655605bd3588e0249dbd5fd52179 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 31 Mar 2023 21:18:50 +0300
Subject: SL-19379 WIP show fallback image with original size

---
 indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index 05a02158c0..b343aafca5 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -16,7 +16,7 @@
   <string name="worn_string">(worn)</string>
   <thumbnail
    name="preview_thumbnail"
-   image_name="Thumbnail_Fallback"
+   fallback_image="Thumbnail_Fallback"
    layout="topleft"
    follows="left|top"
    interactable="false"
-- 
cgit v1.2.3


From cc39c1e852b1b8ad0e6dc2bb7907b8116c716c1d Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 6 Apr 2023 19:51:08 +0300
Subject: SL-19544 preparation for Combination view

---
 .../skins/default/xui/en/menu_inventory_view_default.xml      |  1 -
 indra/newview/skins/default/xui/en/panel_main_inventory.xml   | 11 +++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
index 28ec8f2bf1..c7f9822e41 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -89,7 +89,6 @@
     <menu_item_check
      label="Combination view"
      layout="topleft"
-     enabled="false"
      name="combination_view">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index d670161e00..dc8720b9d1 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -328,4 +328,15 @@
        follows="all"
        layout="topleft" />
     </panel>
+    <panel
+     follows="all"
+     halign="center"
+     height="372"
+     layout="topleft"
+     left="7"
+     name="combination_view_inventory"
+     top_delta="0"
+     visible="false"
+     width="312">
+    </panel>
 </panel>
-- 
cgit v1.2.3


From b3beabec8660602a891c94f4afb8c63a2b31e62f Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 6 Apr 2023 20:12:56 +0300
Subject: SL-19550 Add a shop menu item to the Inventory menu

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

(limited to 'indra/newview/skins')

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 3385a29a6c..12ba121d3c 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -290,4 +290,13 @@
                     function="Inventory.EnvironmentEnabled" />
         </menu_item_call>
     </menu>
-</menu>
\ No newline at end of file
+    <menu_item_separator/>
+    <menu_item_call
+     label="Shop..."
+     layout="topleft"
+     name="Shop">
+        <menu_item_call.on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="shop" />
+    </menu_item_call>
+</menu>
-- 
cgit v1.2.3


From d5a949d97a67c8b9e551fc4b22d4c901eaf1d91a Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 7 Apr 2023 15:13:47 +0300
Subject: SL-19544 WIP Combination view first pass

---
 .../default/xui/en/panel_inventory_gallery.xml     |  2 +-
 .../skins/default/xui/en/panel_main_inventory.xml  | 74 +++++++++++++++++++++-
 2 files changed, 73 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
index b32d592bf6..2b80e30696 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
    background_visible="true"
-   bg_alpha_color="DkGray"
+   bg_alpha_color="InventoryBackgroundColor"
    border="false"
    follows="all"
    height="390"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index dc8720b9d1..6eb1cf0498 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -286,8 +286,7 @@
        name="single_folder_inv"
        follows="all"
        left="0"
-       top="0"
-       top_pad="5"
+       top_pad="1"
        height="372"
        width="312"
        layout="topleft"
@@ -338,5 +337,76 @@
      top_delta="0"
      visible="false"
      width="312">
+     <layout_stack
+      follows="all"
+      height="372"
+      width="312"
+      animate="false"
+      top="0"
+      left="0"
+      orientation="vertical">
+       <layout_panel
+        border="false"
+        bevel_style="in"
+        user_resize="true"
+        auto_resize="true"
+        height="186"
+        width="312"
+        min_width="150"
+        name="comb_gallery_layout">
+        <panel
+         class="inventory_gallery"
+         filename="panel_inventory_gallery.xml"
+         left="0"
+         top_pad="0"
+         height="178"
+         width="312"
+         name="comb_gallery_view_inv"
+         background_visible="true"
+         follows="all"
+         layout="topleft">
+        </panel>
+        <view_border
+         bevel_style="none"
+         height="0"
+         follows="left|bottom|right"
+         layout="topleft"
+         left="6"
+         name="border"
+         top_pad="8"
+         width="300"/>
+       </layout_panel>
+       <layout_panel
+        border="false"
+        bevel_style="in"
+        user_resize="true"
+        auto_resize="true"
+        height="186"
+        width="312"
+        name="comb_inventory_layout">
+        <single_folder_inventory_panel
+         name="comb_single_folder_inv"
+         follows="all"
+         left="0"
+         top="1"
+         height="181"
+         width="312"
+         layout="topleft"
+         show_item_link_overlays="true"
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         scroll.reserve_scroll_corner="false">
+         <item
+          single_folder_mode="true"
+          folder_indentation="-8"/>
+         <folder
+          single_folder_mode="true"
+          folder_indentation="-8"/>
+        </single_folder_inventory_panel>
+       </layout_panel>
+     </layout_stack>
     </panel>
 </panel>
-- 
cgit v1.2.3


From bdd4cb5963df9550eb8e9c0bca0eff0010b44b1e Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 12 Apr 2023 19:11:59 +0300
Subject: SL-19544 WIP show drag handler control

---
 .../skins/default/xui/en/panel_main_inventory.xml      | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 6eb1cf0498..551e9835df 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -342,6 +342,13 @@
       height="372"
       width="312"
       animate="false"
+      drag_handle_gap="13"
+      drag_handle_thickness="6"
+      drag_handle_first_indent="18"
+      drag_handle_second_indent="18"
+      drag_handle_color="AddPaymentPanel"
+      drag_handle_shift="5"
+      show_drag_handle="true"
       top="0"
       left="0"
       orientation="vertical">
@@ -359,22 +366,13 @@
          filename="panel_inventory_gallery.xml"
          left="0"
          top_pad="0"
-         height="178"
+         height="186"
          width="312"
          name="comb_gallery_view_inv"
          background_visible="true"
          follows="all"
          layout="topleft">
         </panel>
-        <view_border
-         bevel_style="none"
-         height="0"
-         follows="left|bottom|right"
-         layout="topleft"
-         left="6"
-         name="border"
-         top_pad="8"
-         width="300"/>
        </layout_panel>
        <layout_panel
         border="false"
-- 
cgit v1.2.3


From 37530c9d736d90ec29b97e3567346a02e2826f97 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 12 Apr 2023 21:11:36 +0300
Subject: SL-19544 WIP hide inventory pane in Combination view, if there is no
 visible items

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 551e9835df..5bc0113367 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -357,7 +357,7 @@
         bevel_style="in"
         user_resize="true"
         auto_resize="true"
-        height="186"
+        height="246"
         width="312"
         min_width="150"
         name="comb_gallery_layout">
@@ -366,7 +366,7 @@
          filename="panel_inventory_gallery.xml"
          left="0"
          top_pad="0"
-         height="186"
+         height="246"
          width="312"
          name="comb_gallery_view_inv"
          background_visible="true"
@@ -379,7 +379,7 @@
         bevel_style="in"
         user_resize="true"
         auto_resize="true"
-        height="186"
+        height="126"
         width="312"
         name="comb_inventory_layout">
         <single_folder_inventory_panel
@@ -387,7 +387,7 @@
          follows="all"
          left="0"
          top="1"
-         height="181"
+         height="126"
          width="312"
          layout="topleft"
          show_item_link_overlays="true"
-- 
cgit v1.2.3


From 107a7eb919bb0afadf6ad3f92482cf7e6d67c56e Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 13 Apr 2023 17:49:26 +0300
Subject: SL-19544 WIP add active suffix for gestures and add appropriate
 context menu handling

---
 indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index b343aafca5..e7589f889f 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -14,6 +14,7 @@
    left="0"
    top="0">
   <string name="worn_string">(worn)</string>
+  <string name="active_string">(active)</string>
   <thumbnail
    name="preview_thumbnail"
    fallback_image="Thumbnail_Fallback"
-- 
cgit v1.2.3


From 5554686b9117901cddb3d36f237622442c1d7a8d Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 17 Apr 2023 13:22:27 +0300
Subject: SL-19544 WIP show item permissions after item name

---
 .../default/xui/en/panel_inventory_gallery_item.xml    | 18 ++----------------
 indra/newview/skins/default/xui/en/strings.xml         |  1 +
 2 files changed, 3 insertions(+), 16 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index e7589f889f..574872a870 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -13,8 +13,6 @@
    layout="topleft"
    left="0"
    top="0">
-  <string name="worn_string">(worn)</string>
-  <string name="active_string">(active)</string>
   <thumbnail
    name="preview_thumbnail"
    fallback_image="Thumbnail_Fallback"
@@ -62,28 +60,16 @@
       length="1"
       follows="left|top"
       left="1"
-      height="10"
+      height="23"
       layout="topleft"
       name="item_name"
       parse_urls="false"
       text_readonly_color="White"
+      word_wrap="true"
       top="2"
       width="127"
       use_ellipses="true">
       Item name, folder name.
     </text>
-    <text
-      read_only="true"
-      length="1"
-      follows="left|top"
-      left="1"
-      height="10"
-      layout="topleft"
-      name="suffix_text"
-      text_readonly_color="InventoryItemLinkColor"
-      top="13"
-      width="127">
-      (worn)
-    </text>
   </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 48715d5b32..2fbdaf7bd0 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2393,6 +2393,7 @@ If you continue to receive this message, please contact Second Life support for
   <string name="Unconstrained">Unconstrained</string>
 
 	<!-- use value="" because they have preceding spaces -->
+    <string name="active" value=" (active)"/>
 	<string name="no_transfer" value=" (no transfer)" />
 	<string name="no_modify"   value=" (no modify)" />
 	<string name="no_copy"     value=" (no copy)" />
-- 
cgit v1.2.3


From 0091fa0cbaba034da09d42d49f68c63f2cc7df14 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 26 Apr 2023 03:53:05 +0300
Subject: SL-19583 Uniform risizing for combination inventory view

---
 .../skins/default/xui/en/panel_main_inventory.xml  | 114 ++++++++-------------
 1 file changed, 44 insertions(+), 70 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 5bc0113367..f772c1fde2 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -327,7 +327,7 @@
        follows="all"
        layout="topleft" />
     </panel>
-    <panel
+    <scroll_container
      follows="all"
      halign="center"
      height="372"
@@ -337,74 +337,48 @@
      top_delta="0"
      visible="false"
      width="312">
-     <layout_stack
-      follows="all"
-      height="372"
-      width="312"
-      animate="false"
-      drag_handle_gap="13"
-      drag_handle_thickness="6"
-      drag_handle_first_indent="18"
-      drag_handle_second_indent="18"
-      drag_handle_color="AddPaymentPanel"
-      drag_handle_shift="5"
-      show_drag_handle="true"
-      top="0"
-      left="0"
-      orientation="vertical">
-       <layout_panel
-        border="false"
-        bevel_style="in"
-        user_resize="true"
-        auto_resize="true"
-        height="246"
-        width="312"
-        min_width="150"
-        name="comb_gallery_layout">
-        <panel
-         class="inventory_gallery"
-         filename="panel_inventory_gallery.xml"
-         left="0"
-         top_pad="0"
-         height="246"
-         width="312"
-         name="comb_gallery_view_inv"
-         background_visible="true"
-         follows="all"
-         layout="topleft">
+           <panel
+            name="combination_scroller"
+            follows="all"
+            layout="topleft"
+            left="0"
+            top="0"
+            height="20"
+            width="291">
+            <panel
+             class="inventory_gallery"
+             filename="panel_inventory_gallery.xml"
+             follows="left|right"
+             layout="topleft"
+             left="0"
+             top="0"
+             height="10"
+             width="290"
+             name="comb_gallery_view_inv"
+             background_visible="true">
+            </panel>
+            <single_folder_inventory_panel
+             name="comb_single_folder_inv"
+             follows="left|right"
+             layout="topleft"
+             left="0"
+             top="200"
+             height="10"
+             width="290"
+             show_item_link_overlays="true"
+             bg_opaque_color="DkGray2"
+             bg_alpha_color="DkGray2"
+             background_visible="true"
+             border="false"
+             bevel_style="none"
+             scroll.reserve_scroll_corner="false">
+                <item
+                 single_folder_mode="true"
+                 folder_indentation="-8"/>
+                <folder
+                 single_folder_mode="true"
+                 folder_indentation="-8"/>
+            </single_folder_inventory_panel>
         </panel>
-       </layout_panel>
-       <layout_panel
-        border="false"
-        bevel_style="in"
-        user_resize="true"
-        auto_resize="true"
-        height="126"
-        width="312"
-        name="comb_inventory_layout">
-        <single_folder_inventory_panel
-         name="comb_single_folder_inv"
-         follows="all"
-         left="0"
-         top="1"
-         height="126"
-         width="312"
-         layout="topleft"
-         show_item_link_overlays="true"
-         bg_opaque_color="DkGray2"
-         bg_alpha_color="DkGray2"
-         background_visible="true"
-         border="false"
-         bevel_style="none"
-         scroll.reserve_scroll_corner="false">
-         <item
-          single_folder_mode="true"
-          folder_indentation="-8"/>
-         <folder
-          single_folder_mode="true"
-          folder_indentation="-8"/>
-        </single_folder_inventory_panel>
-       </layout_panel>
-     </layout_stack>
-    </panel>
+    </scroll_container>
 </panel>
-- 
cgit v1.2.3


From b4d0aeee37973525589223842e149caa28dea2af Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 12 May 2023 19:17:31 +0300
Subject: SL-19712 Folders and items shouldn't be both called items

---
 .../skins/default/xui/en/floater_change_item_thumbnail.xml        | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index f3f8ee0daa..ec2961b0f3 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -8,6 +8,14 @@
  title="CHANGE ITEM IMAGE"
  width="319">
 
+  <floater.string
+    name="title_item_thumbnail">
+    CHANGE ITEM IMAGE
+  </floater.string>
+  <floater.string
+    name="title_folder_thumbnail">
+    CHANGE FOLDER IMAGE
+  </floater.string>
   <floater.string
     name="tooltip_upload_local">
     Upload from computer
-- 
cgit v1.2.3


From b9fad316a356fd223dcf29ed000de1b86e6a93d3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 29 May 2023 23:37:58 +0300
Subject: SL-17429 Message user when their inventory hits AIS2 limits

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e8fdc84fae..4c8d7fbd83 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6440,6 +6440,14 @@ Your trash is overflowing. This may cause problems logging in.
          yestext="Check trash folder"/>
   </notification>
 
+  <notification
+   icon="notifytip.tga"
+   name="InventoryLimitReachedAIS"
+   type="notifytip">
+Your inventory is experiencing issues. Please, contact support.
+  <tag>fail</tag>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="ConfirmClearBrowserCache"
-- 
cgit v1.2.3


From 23311903106293f29e22d21314bdab03bbd499f7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 31 May 2023 19:28:48 +0300
Subject: Revert "SL-19795 Unified scroll"

---
 .../skins/default/xui/en/panel_main_inventory.xml  | 113 +++++++++++++--------
 1 file changed, 69 insertions(+), 44 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index f772c1fde2..1a9816247b 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -327,7 +327,7 @@
        follows="all"
        layout="topleft" />
     </panel>
-    <scroll_container
+    <panel
      follows="all"
      halign="center"
      height="372"
@@ -337,48 +337,73 @@
      top_delta="0"
      visible="false"
      width="312">
-           <panel
-            name="combination_scroller"
-            follows="all"
-            layout="topleft"
-            left="0"
-            top="0"
-            height="20"
-            width="291">
-            <panel
-             class="inventory_gallery"
-             filename="panel_inventory_gallery.xml"
-             follows="left|right"
-             layout="topleft"
-             left="0"
-             top="0"
-             height="10"
-             width="290"
-             name="comb_gallery_view_inv"
-             background_visible="true">
-            </panel>
-            <single_folder_inventory_panel
-             name="comb_single_folder_inv"
-             follows="left|right"
-             layout="topleft"
-             left="0"
-             top="200"
-             height="10"
-             width="290"
-             show_item_link_overlays="true"
-             bg_opaque_color="DkGray2"
-             bg_alpha_color="DkGray2"
-             background_visible="true"
-             border="false"
-             bevel_style="none"
-             scroll.reserve_scroll_corner="false">
-                <item
-                 single_folder_mode="true"
-                 folder_indentation="-8"/>
-                <folder
-                 single_folder_mode="true"
-                 folder_indentation="-8"/>
-            </single_folder_inventory_panel>
+     <layout_stack
+      follows="all"
+      height="372"
+      width="312"
+      animate="false"
+      drag_handle_gap="13"
+      drag_handle_thickness="6"
+      drag_handle_first_indent="18"
+      drag_handle_second_indent="18"
+      drag_handle_shift="5"
+      show_drag_handle="true"
+      top="0"
+      left="0"
+      orientation="vertical">
+       <layout_panel
+        border="false"
+        bevel_style="in"
+        user_resize="true"
+        auto_resize="true"
+        height="246"
+        width="312"
+        min_width="150"
+        name="comb_gallery_layout">
+        <panel
+         class="inventory_gallery"
+         filename="panel_inventory_gallery.xml"
+         left="0"
+         top_pad="0"
+         height="246"
+         width="312"
+         name="comb_gallery_view_inv"
+         background_visible="true"
+         follows="all"
+         layout="topleft">
         </panel>
-    </scroll_container>
+       </layout_panel>
+       <layout_panel
+        border="false"
+        bevel_style="in"
+        user_resize="true"
+        auto_resize="true"
+        height="126"
+        width="312"
+        name="comb_inventory_layout">
+        <single_folder_inventory_panel
+         name="comb_single_folder_inv"
+         follows="all"
+         left="0"
+         top="1"
+         height="126"
+         width="312"
+         layout="topleft"
+         show_item_link_overlays="true"
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         scroll.reserve_scroll_corner="false">
+         <item
+          single_folder_mode="true"
+          folder_indentation="-8"/>
+         <folder
+          single_folder_mode="true"
+          folder_indentation="-8"/>
+        </single_folder_inventory_panel>
+       </layout_panel>
+     </layout_stack>
+    </panel>
 </panel>
-- 
cgit v1.2.3


From 49b817d5062dbffb915facc3cda7e31dd2322e6e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 31 May 2023 22:31:24 +0300
Subject: SL-19795 fix inventory list offset

---
 indra/newview/skins/default/xui/en/panel_main_inventory.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 1a9816247b..b3ca712aee 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -339,6 +339,7 @@
      width="312">
      <layout_stack
       follows="all"
+      layout="topleft"
       height="372"
       width="312"
       animate="false"
@@ -364,7 +365,7 @@
          class="inventory_gallery"
          filename="panel_inventory_gallery.xml"
          left="0"
-         top_pad="0"
+         top="1"
          height="246"
          width="312"
          name="comb_gallery_view_inv"
-- 
cgit v1.2.3


From c6eeb65d18861ea346cf199faba7bf3f493fdabe Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 1 Jun 2023 00:14:06 +0300
Subject: SL-19795 Smarter combination inventory resizing

---
 indra/newview/skins/default/xui/en/panel_main_inventory.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index b3ca712aee..53803f8067 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -381,6 +381,7 @@
         auto_resize="true"
         height="126"
         width="312"
+        min_height="100"
         name="comb_inventory_layout">
         <single_folder_inventory_panel
          name="comb_single_folder_inv"
-- 
cgit v1.2.3


From 87d24252df91284eb0cd9ab2f08b376ded05554c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 2 Jun 2023 01:58:30 +0300
Subject: SL-19795 Remove extra panels, reuse combination ones instead

---
 .../skins/default/xui/en/panel_main_inventory.xml  | 55 ----------------------
 1 file changed, 55 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 53803f8067..3391c1d00c 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -272,61 +272,6 @@
         </inventory_panel>
       </tab_container>
     </panel>
-    <panel
-     follows="all"
-     halign="center"
-     height="372"
-     layout="topleft"
-     left="7"
-     name="single_folder_inventory"
-     top_delta="0"
-     visible="false"
-     width="312">
-      <single_folder_inventory_panel
-       name="single_folder_inv"
-       follows="all"
-       left="0"
-       top_pad="1"
-       height="372"
-       width="312"
-       layout="topleft"
-       show_item_link_overlays="true"
-       bg_opaque_color="DkGray2"
-       bg_alpha_color="DkGray2"
-       background_visible="true"
-       border="false"
-       bevel_style="none"
-       scroll.reserve_scroll_corner="false">
-        <item
-         single_folder_mode="true"
-         folder_indentation="-8"/>
-        <folder
-         single_folder_mode="true"
-         folder_indentation="-8"/>
-      </single_folder_inventory_panel>
-    </panel>
-    <panel
-     follows="all"
-     halign="center"
-     height="372"
-     layout="topleft"
-     left="7"
-     name="gallery_view_inventory"
-     top_delta="0"
-     visible="false"
-     width="312">
-      <panel
-       class="inventory_gallery"
-       filename="panel_inventory_gallery.xml"
-       left="0"
-       top="0"
-       height="372"
-       width="312"
-       name="gallery_view_inv"
-       background_visible="true"
-       follows="all"
-       layout="topleft" />
-    </panel>
     <panel
      follows="all"
      halign="center"
-- 
cgit v1.2.3


From 42e6c35ace5c54c17460815a19c82486d8b450ca Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 2 Jun 2023 23:03:52 +0300
Subject: SL-17429 Message user when their inventory hits AIS3 limits #2

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4c8d7fbd83..aa8e6176e1 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6440,6 +6440,14 @@ Your trash is overflowing. This may cause problems logging in.
          yestext="Check trash folder"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="InventoryLimitReachedAISAlert"
+   type="alertmodal">
+Your inventory is experiencing issues. Please, contact support.
+  <tag>fail</tag>
+  </notification>
+
   <notification
    icon="notifytip.tga"
    name="InventoryLimitReachedAIS"
-- 
cgit v1.2.3


From eb95bf5da2996b54b65552bfa84f49bfc157520f Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 9 Jun 2023 13:12:45 +0200
Subject: SL-18977 Borders of inventory view in inventory floater seem to be
 cut a bit

---
 indra/newview/skins/default/xui/en/panel_outfits_wearing.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
index b2dc975c6e..ceaff0ea69 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
@@ -18,7 +18,7 @@
      follows="all"
      height="400"
      layout="topleft"
-     left="0"
+     left="3"
      single_expansion="true"
      top="0"
      name="wearables_accordion"
-- 
cgit v1.2.3


From 71534d8fa7083355271eba69a7b6045f0c34463f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 14 Jun 2023 02:03:38 +0300
Subject: SL-19686 WIP Switching single folder view for large inventories
 causes stalls

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 3391c1d00c..64b885c222 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -234,6 +234,7 @@
          name="All Items"
          sort_order_setting="InventorySortOrder"
          show_item_link_overlays="true"
+         preinitialize_views="false"
          top="16"
          width="288">
             <folder double_click_override="true"/>
@@ -252,6 +253,7 @@
          left_delta="0"
          name="Recent Items"
          show_item_link_overlays="true"
+         preinitialize_views="false"
          width="290">
             <folder double_click_override="true"/>
         </recent_inventory_panel>
@@ -265,6 +267,7 @@
          bg_opaque_color="DkGray2"
          bg_alpha_color="DkGray2"
          background_visible="true"
+         preinitialize_views="false"
          border="false"
          bevel_style="none"
          scroll.reserve_scroll_corner="false">
-- 
cgit v1.2.3


From 7ac094e92105122b22b4693dafae7f0cee72d9a0 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 13 Jun 2023 08:45:13 +0200
Subject: SL-18977 Borders of inventory view in inventory floater seem to be
 cut a bit

---
 .../skins/default/xui/en/floater_my_inventory.xml  |  26 +-
 .../skins/default/xui/en/panel_main_inventory.xml  | 473 ++++++++++-----------
 .../skins/default/xui/en/sidepanel_inventory.xml   | 244 +++++------
 3 files changed, 351 insertions(+), 392 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
index a9900f05b7..b75744d432 100644
--- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <floater
+ name="floater_my_inventory"
+ title="INVENTORY"
+ help_topic="sidebar_inventory"
  positioning="cascading"
- can_close="true"
- can_resize="true"
+ width="363"
  height="570"
- help_topic="sidebar_inventory"
  min_width="363"
  min_height="270"
- name="floater_my_inventory"
+ can_close="true"
+ can_resize="true"
  save_rect="true"
  save_visibility="true"
- reuse_instance="true"
- title="INVENTORY"
- width="363" >
-   <panel
-    class="sidepanel_inventory"
-    name="main_panel"
-    filename="sidepanel_inventory.xml"
-    follows="all"
-    top="0"/>
+ reuse_instance="true" >
+  <panel
+   name="main_panel"
+   class="sidepanel_inventory"
+   filename="sidepanel_inventory.xml"
+   follows="all"
+   top="0" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 64b885c222..b170885178 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
+ name="main inventory panel"
  follows="all"
  height="423"
  label="Things"
  layout="topleft"
  min_height="300"
- min_width="240"
- name="main inventory panel"
- width="355">
+ min_width="240" >
   <panel.string
    name="Itemcount">
   </panel.string>
@@ -27,18 +26,18 @@
   <panel.string name="default_mode_btn">Multi_Folder_Mode</panel.string>
   <panel.string name="single_folder_mode_btn">Single_Folder_Mode</panel.string>
   <text
-		     type="string"
-		     length="1"
-		     follows="left|top|right"
-		     height="13"
-		     layout="topleft"
-    		 left="12"
-		     name="ItemcountText"
-		     font="SansSerifMedium"
-		     text_color="InventoryItemLinkColor"
-		     use_ellipses="true"
-		     top_pad="0"
-		     width="300">
+   name="ItemcountText"
+   type="string"
+   length="1"
+   follows="left|top|right"
+   layout="topleft"
+   height="13"
+   left="10"
+   right="-10"
+   font="SansSerifMedium"
+   text_color="InventoryItemLinkColor"
+   use_ellipses="true"
+   top_pad="0">
     Items:
   </text>
   <layout_stack
@@ -46,298 +45,282 @@
    height="25"
    animate="false"
    top_pad="10"
-   left="2"
+   left="8"
    orientation="horizontal">
     <layout_panel
+     name="nav_buttons"
+     width="65"
+     height="25"
      border="false"
      bevel_style="in"
      user_resize="false"
      auto_resize="false"
-     height="25"
-     width="65"
-     name="nav_buttons"
      visible="false">
-     <button
-      follows="top|left"
-      height="23"
-      image_selected="Single_Folder_Back"
-      image_pressed="Single_Folder_Back"
-      image_unselected="Single_Folder_Back"
-      scale_image="false"
-      layout="topleft"
-      left="3"
-      top="2"
-      name="back_btn"
-      tool_tip="Back"
-      width="20" />
-     <button
-      follows="top|left"
-      height="23"
-      image_selected="Single_Folder_Forward"
-      image_pressed="Single_Folder_Forward"
-      image_unselected="Single_Folder_Forward"
-      scale_image="false"
-      layout="topleft"
-      left_pad="1"
-      name="forward_btn"
-      tool_tip="Forward"
-      width="20" />
-     <button
-      follows="top|left"
-      height="23"
-      image_selected="Single_Folder_Up"
-      image_pressed="Single_Folder_Up"
-      image_unselected="Single_Folder_Up"
-      scale_image="false"
-      layout="topleft"
-      left_pad="1"
-      name="up_btn"
-      tool_tip="Go up one level"
-      width="20" />
+      <button
+       name="back_btn"
+       follows="top|left"
+       image_selected="Single_Folder_Back"
+       image_pressed="Single_Folder_Back"
+       image_unselected="Single_Folder_Back"
+       scale_image="false"
+       layout="topleft"
+       top="2"
+       left="3"
+       width="20"
+       height="23"
+       tool_tip="Back" />
+      <button
+       name="forward_btn"
+       follows="top|left"
+       image_selected="Single_Folder_Forward"
+       image_pressed="Single_Folder_Forward"
+       image_unselected="Single_Folder_Forward"
+       scale_image="false"
+       layout="topleft"
+       width="20"
+       height="23"
+       left_pad="1"
+       tool_tip="Forward" />
+      <button
+       name="up_btn"
+       follows="top|left"
+       image_selected="Single_Folder_Up"
+       image_pressed="Single_Folder_Up"
+       image_unselected="Single_Folder_Up"
+       scale_image="false"
+       layout="topleft"
+       width="20"
+       height="23"
+       left_pad="1"
+       tool_tip="Go up one level" />
     </layout_panel>
     <layout_panel
-      border="false"
-      bevel_style="in"
-      user_resize="false"
-      height="25"
-      width="375"
-      visible="true">
+     width="381"
+     height="25"
+     border="false"
+     bevel_style="in"
+     user_resize="false">
       <combo_box
-       height="23"
-       layout="topleft"
-       left="2"
-       top="0"
        name="search_type"
-       tool_tip="Search by"
        follows="top|left"
-       width="67">
-       <item
-        label="Name"
-        name="Name"
-        value="search_by_name"/>
-       <item
-        label="Creator"
-        name="Creator"
-        value="search_by_creator"/>
-       <item
-        label="Description"
-        name="Description"
-        value="search_by_description"/>
-       <item
-        label="UUID"
-        name="UUID"
-        value="search_by_UUID"/>
+       layout="topleft"
+       left="2"
+       width="67"
+       height="23"
+       tool_tip="Search by" >
+        <item
+         name="Name"
+         label="Name"
+         value="search_by_name"/>
+        <item
+         name="Creator"
+         label="Creator"
+         value="search_by_creator"/>
+        <item
+         name="Description"
+         label="Description"
+         value="search_by_description"/>
+        <item
+         name="UUID"
+         label="UUID"
+         value="search_by_UUID"/>
       </combo_box>
       <menu_button
+       name="options_visibility_btn"
        follows="top|left"
-       tool_tip="Search visibility options"
-       height="23"
-       image_overlay="Inv_Toolbar_SearchVisibility"
        layout="topleft"
+       width="31"
+       height="23"
        left_pad="1"
-       name="options_visibility_btn"
-       width="31" />
+       tool_tip="Search visibility options"
+       image_overlay="Inv_Toolbar_SearchVisibility" />
       <filter_editor
+       name="inventory search editor"
+       label="Enter search text"
        text_pad_left="10"
        follows="left|top|right"
-       height="23"
-       label="Enter search text"
        layout="topleft"
+       width="150"
+       height="23"
        left_pad="1"
        max_length_chars="300"
-       highlight_text_field="true"
-       name="inventory search editor"
-       width="150" />
+       highlight_text_field="true" />
       <menu_button
+       name="options_gear_btn"
        follows="top|right"
-       tool_tip="Actions"
+       layout="topleft"
+       width="31"
        height="23"
-       image_hover_unselected="Toolbar_Middle_Over"
+       left_pad="1"
+       tool_tip="Actions"
        image_overlay="OptionsMenu_Off"
        image_selected="Toolbar_Middle_Selected"
        image_unselected="Toolbar_Middle_Off"
-       layout="topleft"
-       left_pad="1"
-       name="options_gear_btn"
-       width="31" />
+       image_hover_unselected="Toolbar_Middle_Over" />
       <menu_button
+       name="view_btn"
        follows="top|right"
-       tool_tip="View &amp; sort options"
+       layout="topleft"
+       width="31"
        height="23"
-       image_hover_unselected="Toolbar_Middle_Over"
+       left_pad="1"
+       tool_tip="View &amp; sort options"
        image_overlay="Conv_toolbar_sort"
        image_selected="Toolbar_Middle_Selected"
        image_unselected="Toolbar_Middle_Off"
-       layout="topleft"
-       left_pad="1"
-       name="view_btn"
-       width="31" />
+       image_hover_unselected="Toolbar_Middle_Over" />
       <button
+       name="add_btn"
        follows="top|right"
+       layout="topleft"
+       width="31"
        height="23"
-       image_hover_unselected="Toolbar_Middle_Over"
+       left_pad="1"
+       tool_tip="Create new item"
        image_overlay="AddItem_Off"
        image_selected="Toolbar_Middle_Selected"
        image_unselected="Toolbar_Middle_Off"
-       layout="topleft"
-       left_pad="1"
-       name="add_btn"
-       tool_tip="Create new item"
-       width="31" />
+       image_hover_unselected="Toolbar_Middle_Over" />
       <button
+       name="view_mode_btn"
        follows="top|right"
-       tool_tip="Switch between views"
+       layout="topleft"
+       width="31"
        height="23"
-       image_hover_unselected="Toolbar_Middle_Over"
+       left_pad="1"
+       tool_tip="Switch between views"
        image_overlay="Single_Folder_Mode"
        image_selected="Toolbar_Middle_Selected"
        image_unselected="Toolbar_Middle_Off"
-       layout="topleft"
-       left_pad="1"
-       name="view_mode_btn"
-       width="31" />
+       image_hover_unselected="Toolbar_Middle_Over" />
     </layout_panel>
-    </layout_stack>
-    <panel
+  </layout_stack>
+  <panel
+   name="default_inventory_panel"
+   layout="topleft"
+   follows="all"
+   height="372"
+   top_pad="10"
+   halign="center">
+    <tab_container
+     name="inventory filter tabs"
      follows="all"
-     halign="center"
-     height="372"
      layout="topleft"
-     left="7"
-     name="default_inventory_panel"
-     top_pad="10"
-     width="312">
-      <tab_container
+     top="0"
+     bottom="-1"
+     tab_height="30"
+     tab_position="top"
+     tab_min_width="100"
+     halign="center">
+      <inventory_panel
+       name="All Items"
+       label="MY INVENTORY"
+       bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
+       layout="topleft"
        follows="all"
-       halign="center"
-       height="372"
+       help_topic="my_inventory_tab"
+       show_item_link_overlays="true"
+       preinitialize_views="false"
+       sort_order_setting="InventorySortOrder"
+       scroll.reserve_scroll_corner="false">
+        <folder double_click_override="true"/>
+      </inventory_panel>
+      <recent_inventory_panel
+       name="Recent Items"
+       label="RECENT"
+       bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
        layout="topleft"
-       left="0"
-       name="inventory filter tabs"
-       tab_height="30"
-       tab_position="top"
-       tab_min_width="100"
-       top="0"
-       width="312">
-        <inventory_panel
-         bg_opaque_color="DkGray2"
-         bg_alpha_color="DkGray2"
-         background_visible="true"
-         border="false"
-         bevel_style="none"
-         follows="all"
-         height="338"
-         label="MY INVENTORY"
-         help_topic="my_inventory_tab"
-         layout="topleft"
-         left="0"
-         name="All Items"
-         sort_order_setting="InventorySortOrder"
-         show_item_link_overlays="true"
-         preinitialize_views="false"
-         top="16"
-         width="288">
-            <folder double_click_override="true"/>
-        </inventory_panel>
-        <recent_inventory_panel
-         bg_opaque_color="DkGray2"
-         bg_alpha_color="DkGray2"
-         background_visible="true"
-         border="false"
-         bevel_style="none"
-         follows="all"
-         height="338"
-         label="RECENT"
-         help_topic="recent_inventory_tab"
-         layout="topleft"
-         left_delta="0"
-         name="Recent Items"
-         show_item_link_overlays="true"
-         preinitialize_views="false"
-         width="290">
-            <folder double_click_override="true"/>
-        </recent_inventory_panel>
-        <inventory_panel
-         name="Worn Items"
-         label="WORN"
-         show_empty_message="false"
-         follows="all"
-         layout="topleft"
-         width="290"
-         bg_opaque_color="DkGray2"
-         bg_alpha_color="DkGray2"
-         background_visible="true"
-         preinitialize_views="false"
-         border="false"
-         bevel_style="none"
-         scroll.reserve_scroll_corner="false">
-            <folder double_click_override="true"/>
-        </inventory_panel>
-      </tab_container>
-    </panel>
-    <panel
+       follows="all"
+       left_pad="10"
+       help_topic="recent_inventory_tab"
+       show_item_link_overlays="true"
+       preinitialize_views="false"
+       scroll.reserve_scroll_corner="false">
+        <folder double_click_override="true"/>
+      </recent_inventory_panel>
+      <inventory_panel
+       name="Worn Items"
+       label="WORN"
+       bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
+       layout="topleft"
+       follows="all"
+       show_item_link_overlays="true"
+       preinitialize_views="false"
+       show_empty_message="false"
+       scroll.reserve_scroll_corner="false">
+        <folder double_click_override="true"/>
+      </inventory_panel>
+    </tab_container>
+  </panel>
+  <panel
+   follows="all"
+   halign="center"
+   height="372"
+   layout="topleft"
+   left="7"
+   name="combination_view_inventory"
+   top_delta="0"
+   visible="false"
+   xwidth="306">
+    <layout_stack
      follows="all"
-     halign="center"
-     height="372"
      layout="topleft"
-     left="7"
-     name="combination_view_inventory"
-     top_delta="0"
-     visible="false"
-     width="312">
-     <layout_stack
-      follows="all"
-      layout="topleft"
-      height="372"
-      width="312"
-      animate="false"
-      drag_handle_gap="13"
-      drag_handle_thickness="6"
-      drag_handle_first_indent="18"
-      drag_handle_second_indent="18"
-      drag_handle_shift="5"
-      show_drag_handle="true"
-      top="0"
-      left="0"
-      orientation="vertical">
-       <layout_panel
-        border="false"
-        bevel_style="in"
-        user_resize="true"
-        auto_resize="true"
-        height="246"
-        width="312"
-        min_width="150"
-        name="comb_gallery_layout">
+     height="372"
+     xwidth="306"
+     animate="false"
+     drag_handle_gap="13"
+     drag_handle_thickness="6"
+     drag_handle_first_indent="18"
+     drag_handle_second_indent="18"
+     drag_handle_shift="5"
+     show_drag_handle="true"
+     top="0"
+     left="0"
+     orientation="vertical">
+      <layout_panel
+       border="false"
+       bevel_style="in"
+       user_resize="true"
+       auto_resize="true"
+       height="246"
+       xwidth="306"
+       min_width="150"
+       name="comb_gallery_layout">
         <panel
          class="inventory_gallery"
          filename="panel_inventory_gallery.xml"
          left="0"
          top="1"
          height="246"
-         width="312"
+         xwidth="304"
          name="comb_gallery_view_inv"
          background_visible="true"
          follows="all"
          layout="topleft">
         </panel>
-       </layout_panel>
-       <layout_panel
-        border="false"
-        bevel_style="in"
-        user_resize="true"
-        auto_resize="true"
-        height="126"
-        width="312"
-        min_height="100"
-        name="comb_inventory_layout">
+      </layout_panel>
+      <layout_panel
+       border="false"
+       bevel_style="in"
+       user_resize="true"
+       auto_resize="true"
+       height="126"
+       xwidth="306"
+       min_height="100"
+       name="comb_inventory_layout">
         <single_folder_inventory_panel
          name="comb_single_folder_inv"
          follows="all"
          left="0"
          top="1"
          height="126"
-         width="312"
+         xwidth="304"
          layout="topleft"
          show_item_link_overlays="true"
          bg_opaque_color="DkGray2"
@@ -346,14 +329,14 @@
          border="false"
          bevel_style="none"
          scroll.reserve_scroll_corner="false">
-         <item
-          single_folder_mode="true"
-          folder_indentation="-8"/>
-         <folder
-          single_folder_mode="true"
-          folder_indentation="-8"/>
+          <item
+           single_folder_mode="true"
+           folder_indentation="-8"/>
+          <folder
+           single_folder_mode="true"
+           folder_indentation="-8"/>
         </single_folder_inventory_panel>
-       </layout_panel>
-     </layout_stack>
-    </panel>
+      </layout_panel>
+    </layout_stack>
+  </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index dfd3e3bf9d..c1c534f734 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -1,137 +1,113 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-	  follows="all"
-	  height="570"
-	  label="Things"
-	  layout="topleft"
-	  min_height="350"
-	  min_width="240"
-	  name="objects panel"
-	  width="358">
-    <panel
-		 follows="all"
-		 layout="topleft"
-		 left="0"
-		 name="sidepanel_inventory_panel"
-		 top="0"
-		 label=""
-		 height="570"
-		 visible="true"
-		 default_tab_group="1"
-		 width="395">
-      <layout_stack
-              follows="left|right|top|bottom"
-              layout="topleft"
-              left="0"
-              top="0"
-							tab_group="1"
-              orientation="vertical"
-              name="inventory_layout_stack"
-              height="565"
-              width="395">
-             <layout_panel
-                 name="main_inventory_layout_panel"
-                 layout="topleft"
-                 auto_resize="true"
-                 user_resize="true"
-                 min_dim="150"
-                 width="395"
-                 follows="bottom|left|right"
-                 height="300">
-                 <panel
-                      class="panel_main_inventory"
-                      filename="panel_main_inventory.xml"
-                      follows="all"
-                      layout="topleft"
-                      left="0"
-                      name="panel_main_inventory"
-                      top="0"
-                      label=""
-                      height="300"
-                      width="395" />
-             </layout_panel>
-			    <layout_panel
-                 width="355"
-                 layout="topleft"
-                 auto_resize="false"
-                 user_resize="true"
-                 follows="left|right|top"
-                 name="inbox_layout_panel"
-                 visible="true"
-                 min_dim="35"
-                 expanded_min_dim="90"
-                 height="235">
-                 <panel
-                      follows="all"
-                      layout="topleft"
-                      left="0"
-                      name="marketplace_inbox"
-                      class="panel_marketplace_inbox"
-                      top="0"
-                      label=""
-                      height="235"
-                      width="330">
-                     <string name="InboxLabelWithArg">Received items ([NUM])</string>
-                     <string name="InboxLabelNoArg">Received items</string>
-                     <button
-                        control_name="InventoryInboxToggleState"
-                        label="Received items"
-												font="SansSerifMedium"
-                        name="inbox_btn"
-                        height="35"
-                        width="308"
-                        image_unselected="MarketplaceBtn_Off"
-                        image_selected="MarketplaceBtn_Selected"
-                        halign="left"
-                        handle_right_mouse="false"
-                        follows="top|left|right"
-                        is_toggle="true"
-                        tab_stop="false"
-                        pad_left="35"
-                        top="0"
-                        left="10" />
-                     <text
-                        type="string"
-                        length="1"
-                        follows="right|top"
-                        layout="topleft"
-                        height="13"
-                        top="10"
-                        right="-20"
-                        name="inbox_fresh_new_count"
-                        font="SansSerifMedium"
-                        halign="right"
-                        top_pad="0"
-                        width="300">
-                        [NUM] new
-                     </text>
-                     <panel
-                        name="inbox_inventory_placeholder_panel"
-                        follows="all"
-                        left="10"
-                        bottom="235"
-                        width="308"
-                        top="35"
-                        bg_opaque_color="InventoryBackgroundColor"
-                        background_visible="true"
-                        background_opaque="true"
-                        tool_tip="Drag and drop items to your inventory to use them"
-                        >
-                        <text name="inbox_inventory_placeholder"
-															type="string"
-															follows="all"
-															layout="topleft"
-															top="0"
-															left="0"
-															width="308"
-															height="200"
-															wrap="true"
-															halign="center">
-Purchases from the marketplace will be delivered here.
-												</text>
-                    </panel>
-                 </panel>
-             </layout_panel>
-         </layout_stack>
-	</panel>
+ name="objects panel"
+ label="Things"
+ layout="topleft"
+ follows="all"
+ height="570"
+ min_height="350"
+ min_width="240">
+  <panel
+   name="sidepanel_inventory_panel"
+   layout="topleft"
+   follows="all"
+   top="0"
+   height="570"
+   default_tab_group="1">
+    <layout_stack
+     name="inventory_layout_stack"
+     layout="topleft"
+     follows="all"
+     top="0"
+     height="560"
+     tab_group="1"
+     orientation="vertical">
+      <layout_panel
+       name="main_inventory_layout_panel"
+       layout="topleft"
+       follows="bottom|left|right"
+       height="300"
+       auto_resize="true"
+       user_resize="true"
+       min_dim="150">
+        <panel
+         name="panel_main_inventory"
+         class="panel_main_inventory"
+         filename="panel_main_inventory.xml"
+         layout="topleft"
+         follows="all"
+         top="0"
+         height="300" />
+      </layout_panel>
+      <layout_panel
+       name="inbox_layout_panel"
+       follows="left|right|top"
+       layout="topleft"
+       min_dim="35"
+       expanded_min_dim="90"
+       auto_resize="false"
+       user_resize="true" >
+        <panel
+         name="marketplace_inbox"
+         class="panel_marketplace_inbox"
+         layout="topleft"
+         follows="all" >
+          <string name="InboxLabelWithArg">Received items ([NUM])</string>
+          <string name="InboxLabelNoArg">Received items</string>
+          <button
+           name="inbox_btn"
+           control_name="InventoryInboxToggleState"
+           label="Received items"
+           font="SansSerifMedium"
+           follows="top|left|right"
+           height="35"
+           image_unselected="MarketplaceBtn_Off"
+           image_selected="MarketplaceBtn_Selected"
+           pad_left="35"
+           left="10"
+           right="-10"
+           halign="left"
+           is_toggle="true"
+           tab_stop="false"
+           handle_right_mouse="false" />
+          <text
+           name="inbox_fresh_new_count"
+           font="SansSerifMedium"
+           type="string"
+           length="1"
+           follows="right|top"
+           layout="topleft"
+           height="13"
+           top_pad="0"
+           top="10"
+           right="-20"
+           halign="right">
+            [NUM] new
+          </text>
+          <panel
+           name="inbox_inventory_placeholder_panel"
+           bg_opaque_color="InventoryBackgroundColor"
+           background_visible="true"
+           background_opaque="true"
+           follows="all"
+           top="36"
+           right="-10"
+           bottom="10"
+           tool_tip="Drag and drop items to your inventory to use them" >
+            <text
+             name="inbox_inventory_placeholder"
+             type="string"
+             follows="all"
+             layout="topleft"
+             top="1"
+             bottom="-1"
+             wrap="true"
+             halign="center">
+              Purchases from the marketplace will be delivered here.
+            </text>
+          </panel>
+        </panel>
+      </layout_panel>
+    </layout_stack>
+  </panel>
 </panel>
-- 
cgit v1.2.3


From b848e6d6b71976f1d9a5d28bcceb680b9b8f1779 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 15 Jun 2023 15:46:54 +0300
Subject: SL-19863 remove unused menu items to get rid of callback warnings

---
 .../default/xui/en/menu_gallery_inventory.xml      | 24 ----------------------
 1 file changed, 24 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
index 15466e8f32..46afa3821b 100644
--- a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -23,22 +23,6 @@
         <menu_item_call.on_click
          function="Inventory.EmptyLostAndFound"/>
     </menu_item_call>
-    <menu_item_call
-     label="New Folder"
-     layout="topleft"
-     name="New Folder">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="category" />
-    </menu_item_call>
-    <menu_item_call
-     label="New Outfit"
-     layout="topleft"
-     name="New Outfit">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="outfit" />
-    </menu_item_call>
     <menu_item_call
      label="Teleport"
      layout="topleft"
@@ -323,14 +307,6 @@
         function="Inventory.DoToSelected"
         parameter="request_lure" />
     </menu_item_call>
-    <menu_item_call
-     label="Start Conference Chat"
-     layout="topleft"
-     name="Conference Chat">
-        <menu_item_call.on_click
-         function="Inventory.BeginIMSession"
-         parameter="selected" />
-    </menu_item_call>
     <menu_item_separator
      layout="topleft" 
      name="Gesture Separator" />
-- 
cgit v1.2.3


From 44e746c2068aa983c15336277fc8f988fcb94303 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 15 Jun 2023 23:10:56 +0300
Subject: Revert "SL-18977 Borders of inventory view in inventory floater seem
 to be cut a bit"

This reverts commit 7ac094e92105122b22b4693dafae7f0cee72d9a0.
Commit breaks gallery panel, it is not ready.
---
 .../skins/default/xui/en/floater_my_inventory.xml  |  26 +-
 .../skins/default/xui/en/panel_main_inventory.xml  | 473 +++++++++++----------
 .../skins/default/xui/en/sidepanel_inventory.xml   | 244 ++++++-----
 3 files changed, 392 insertions(+), 351 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
index b75744d432..a9900f05b7 100644
--- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <floater
- name="floater_my_inventory"
- title="INVENTORY"
- help_topic="sidebar_inventory"
  positioning="cascading"
- width="363"
+ can_close="true"
+ can_resize="true"
  height="570"
+ help_topic="sidebar_inventory"
  min_width="363"
  min_height="270"
- can_close="true"
- can_resize="true"
+ name="floater_my_inventory"
  save_rect="true"
  save_visibility="true"
- reuse_instance="true" >
-  <panel
-   name="main_panel"
-   class="sidepanel_inventory"
-   filename="sidepanel_inventory.xml"
-   follows="all"
-   top="0" />
+ reuse_instance="true"
+ title="INVENTORY"
+ width="363" >
+   <panel
+    class="sidepanel_inventory"
+    name="main_panel"
+    filename="sidepanel_inventory.xml"
+    follows="all"
+    top="0"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index b170885178..64b885c222 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- name="main inventory panel"
  follows="all"
  height="423"
  label="Things"
  layout="topleft"
  min_height="300"
- min_width="240" >
+ min_width="240"
+ name="main inventory panel"
+ width="355">
   <panel.string
    name="Itemcount">
   </panel.string>
@@ -26,18 +27,18 @@
   <panel.string name="default_mode_btn">Multi_Folder_Mode</panel.string>
   <panel.string name="single_folder_mode_btn">Single_Folder_Mode</panel.string>
   <text
-   name="ItemcountText"
-   type="string"
-   length="1"
-   follows="left|top|right"
-   layout="topleft"
-   height="13"
-   left="10"
-   right="-10"
-   font="SansSerifMedium"
-   text_color="InventoryItemLinkColor"
-   use_ellipses="true"
-   top_pad="0">
+		     type="string"
+		     length="1"
+		     follows="left|top|right"
+		     height="13"
+		     layout="topleft"
+    		 left="12"
+		     name="ItemcountText"
+		     font="SansSerifMedium"
+		     text_color="InventoryItemLinkColor"
+		     use_ellipses="true"
+		     top_pad="0"
+		     width="300">
     Items:
   </text>
   <layout_stack
@@ -45,282 +46,298 @@
    height="25"
    animate="false"
    top_pad="10"
-   left="8"
+   left="2"
    orientation="horizontal">
     <layout_panel
-     name="nav_buttons"
-     width="65"
-     height="25"
      border="false"
      bevel_style="in"
      user_resize="false"
      auto_resize="false"
+     height="25"
+     width="65"
+     name="nav_buttons"
      visible="false">
-      <button
-       name="back_btn"
-       follows="top|left"
-       image_selected="Single_Folder_Back"
-       image_pressed="Single_Folder_Back"
-       image_unselected="Single_Folder_Back"
-       scale_image="false"
-       layout="topleft"
-       top="2"
-       left="3"
-       width="20"
-       height="23"
-       tool_tip="Back" />
-      <button
-       name="forward_btn"
-       follows="top|left"
-       image_selected="Single_Folder_Forward"
-       image_pressed="Single_Folder_Forward"
-       image_unselected="Single_Folder_Forward"
-       scale_image="false"
-       layout="topleft"
-       width="20"
-       height="23"
-       left_pad="1"
-       tool_tip="Forward" />
-      <button
-       name="up_btn"
-       follows="top|left"
-       image_selected="Single_Folder_Up"
-       image_pressed="Single_Folder_Up"
-       image_unselected="Single_Folder_Up"
-       scale_image="false"
-       layout="topleft"
-       width="20"
-       height="23"
-       left_pad="1"
-       tool_tip="Go up one level" />
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Single_Folder_Back"
+      image_pressed="Single_Folder_Back"
+      image_unselected="Single_Folder_Back"
+      scale_image="false"
+      layout="topleft"
+      left="3"
+      top="2"
+      name="back_btn"
+      tool_tip="Back"
+      width="20" />
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Single_Folder_Forward"
+      image_pressed="Single_Folder_Forward"
+      image_unselected="Single_Folder_Forward"
+      scale_image="false"
+      layout="topleft"
+      left_pad="1"
+      name="forward_btn"
+      tool_tip="Forward"
+      width="20" />
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Single_Folder_Up"
+      image_pressed="Single_Folder_Up"
+      image_unselected="Single_Folder_Up"
+      scale_image="false"
+      layout="topleft"
+      left_pad="1"
+      name="up_btn"
+      tool_tip="Go up one level"
+      width="20" />
     </layout_panel>
     <layout_panel
-     width="381"
-     height="25"
-     border="false"
-     bevel_style="in"
-     user_resize="false">
+      border="false"
+      bevel_style="in"
+      user_resize="false"
+      height="25"
+      width="375"
+      visible="true">
       <combo_box
-       name="search_type"
-       follows="top|left"
+       height="23"
        layout="topleft"
        left="2"
-       width="67"
-       height="23"
-       tool_tip="Search by" >
-        <item
-         name="Name"
-         label="Name"
-         value="search_by_name"/>
-        <item
-         name="Creator"
-         label="Creator"
-         value="search_by_creator"/>
-        <item
-         name="Description"
-         label="Description"
-         value="search_by_description"/>
-        <item
-         name="UUID"
-         label="UUID"
-         value="search_by_UUID"/>
+       top="0"
+       name="search_type"
+       tool_tip="Search by"
+       follows="top|left"
+       width="67">
+       <item
+        label="Name"
+        name="Name"
+        value="search_by_name"/>
+       <item
+        label="Creator"
+        name="Creator"
+        value="search_by_creator"/>
+       <item
+        label="Description"
+        name="Description"
+        value="search_by_description"/>
+       <item
+        label="UUID"
+        name="UUID"
+        value="search_by_UUID"/>
       </combo_box>
       <menu_button
-       name="options_visibility_btn"
        follows="top|left"
-       layout="topleft"
-       width="31"
+       tool_tip="Search visibility options"
        height="23"
+       image_overlay="Inv_Toolbar_SearchVisibility"
+       layout="topleft"
        left_pad="1"
-       tool_tip="Search visibility options"
-       image_overlay="Inv_Toolbar_SearchVisibility" />
+       name="options_visibility_btn"
+       width="31" />
       <filter_editor
-       name="inventory search editor"
-       label="Enter search text"
        text_pad_left="10"
        follows="left|top|right"
-       layout="topleft"
-       width="150"
        height="23"
+       label="Enter search text"
+       layout="topleft"
        left_pad="1"
        max_length_chars="300"
-       highlight_text_field="true" />
+       highlight_text_field="true"
+       name="inventory search editor"
+       width="150" />
       <menu_button
-       name="options_gear_btn"
        follows="top|right"
-       layout="topleft"
-       width="31"
-       height="23"
-       left_pad="1"
        tool_tip="Actions"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
        image_overlay="OptionsMenu_Off"
        image_selected="Toolbar_Middle_Selected"
        image_unselected="Toolbar_Middle_Off"
-       image_hover_unselected="Toolbar_Middle_Over" />
-      <menu_button
-       name="view_btn"
-       follows="top|right"
        layout="topleft"
-       width="31"
-       height="23"
        left_pad="1"
+       name="options_gear_btn"
+       width="31" />
+      <menu_button
+       follows="top|right"
        tool_tip="View &amp; sort options"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
        image_overlay="Conv_toolbar_sort"
        image_selected="Toolbar_Middle_Selected"
        image_unselected="Toolbar_Middle_Off"
-       image_hover_unselected="Toolbar_Middle_Over" />
+       layout="topleft"
+       left_pad="1"
+       name="view_btn"
+       width="31" />
       <button
-       name="add_btn"
        follows="top|right"
-       layout="topleft"
-       width="31"
        height="23"
-       left_pad="1"
-       tool_tip="Create new item"
+       image_hover_unselected="Toolbar_Middle_Over"
        image_overlay="AddItem_Off"
        image_selected="Toolbar_Middle_Selected"
        image_unselected="Toolbar_Middle_Off"
-       image_hover_unselected="Toolbar_Middle_Over" />
-      <button
-       name="view_mode_btn"
-       follows="top|right"
        layout="topleft"
-       width="31"
-       height="23"
        left_pad="1"
+       name="add_btn"
+       tool_tip="Create new item"
+       width="31" />
+      <button
+       follows="top|right"
        tool_tip="Switch between views"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
        image_overlay="Single_Folder_Mode"
        image_selected="Toolbar_Middle_Selected"
        image_unselected="Toolbar_Middle_Off"
-       image_hover_unselected="Toolbar_Middle_Over" />
+       layout="topleft"
+       left_pad="1"
+       name="view_mode_btn"
+       width="31" />
     </layout_panel>
-  </layout_stack>
-  <panel
-   name="default_inventory_panel"
-   layout="topleft"
-   follows="all"
-   height="372"
-   top_pad="10"
-   halign="center">
-    <tab_container
-     name="inventory filter tabs"
+    </layout_stack>
+    <panel
      follows="all"
+     halign="center"
+     height="372"
      layout="topleft"
-     top="0"
-     bottom="-1"
-     tab_height="30"
-     tab_position="top"
-     tab_min_width="100"
-     halign="center">
-      <inventory_panel
-       name="All Items"
-       label="MY INVENTORY"
-       bg_opaque_color="DkGray2"
-       bg_alpha_color="DkGray2"
-       background_visible="true"
-       layout="topleft"
+     left="7"
+     name="default_inventory_panel"
+     top_pad="10"
+     width="312">
+      <tab_container
        follows="all"
-       help_topic="my_inventory_tab"
-       show_item_link_overlays="true"
-       preinitialize_views="false"
-       sort_order_setting="InventorySortOrder"
-       scroll.reserve_scroll_corner="false">
-        <folder double_click_override="true"/>
-      </inventory_panel>
-      <recent_inventory_panel
-       name="Recent Items"
-       label="RECENT"
-       bg_opaque_color="DkGray2"
-       bg_alpha_color="DkGray2"
-       background_visible="true"
+       halign="center"
+       height="372"
        layout="topleft"
-       follows="all"
-       left_pad="10"
-       help_topic="recent_inventory_tab"
-       show_item_link_overlays="true"
-       preinitialize_views="false"
-       scroll.reserve_scroll_corner="false">
-        <folder double_click_override="true"/>
-      </recent_inventory_panel>
-      <inventory_panel
-       name="Worn Items"
-       label="WORN"
-       bg_opaque_color="DkGray2"
-       bg_alpha_color="DkGray2"
-       background_visible="true"
-       layout="topleft"
-       follows="all"
-       show_item_link_overlays="true"
-       preinitialize_views="false"
-       show_empty_message="false"
-       scroll.reserve_scroll_corner="false">
-        <folder double_click_override="true"/>
-      </inventory_panel>
-    </tab_container>
-  </panel>
-  <panel
-   follows="all"
-   halign="center"
-   height="372"
-   layout="topleft"
-   left="7"
-   name="combination_view_inventory"
-   top_delta="0"
-   visible="false"
-   xwidth="306">
-    <layout_stack
+       left="0"
+       name="inventory filter tabs"
+       tab_height="30"
+       tab_position="top"
+       tab_min_width="100"
+       top="0"
+       width="312">
+        <inventory_panel
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         follows="all"
+         height="338"
+         label="MY INVENTORY"
+         help_topic="my_inventory_tab"
+         layout="topleft"
+         left="0"
+         name="All Items"
+         sort_order_setting="InventorySortOrder"
+         show_item_link_overlays="true"
+         preinitialize_views="false"
+         top="16"
+         width="288">
+            <folder double_click_override="true"/>
+        </inventory_panel>
+        <recent_inventory_panel
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         follows="all"
+         height="338"
+         label="RECENT"
+         help_topic="recent_inventory_tab"
+         layout="topleft"
+         left_delta="0"
+         name="Recent Items"
+         show_item_link_overlays="true"
+         preinitialize_views="false"
+         width="290">
+            <folder double_click_override="true"/>
+        </recent_inventory_panel>
+        <inventory_panel
+         name="Worn Items"
+         label="WORN"
+         show_empty_message="false"
+         follows="all"
+         layout="topleft"
+         width="290"
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         preinitialize_views="false"
+         border="false"
+         bevel_style="none"
+         scroll.reserve_scroll_corner="false">
+            <folder double_click_override="true"/>
+        </inventory_panel>
+      </tab_container>
+    </panel>
+    <panel
      follows="all"
-     layout="topleft"
+     halign="center"
      height="372"
-     xwidth="306"
-     animate="false"
-     drag_handle_gap="13"
-     drag_handle_thickness="6"
-     drag_handle_first_indent="18"
-     drag_handle_second_indent="18"
-     drag_handle_shift="5"
-     show_drag_handle="true"
-     top="0"
-     left="0"
-     orientation="vertical">
-      <layout_panel
-       border="false"
-       bevel_style="in"
-       user_resize="true"
-       auto_resize="true"
-       height="246"
-       xwidth="306"
-       min_width="150"
-       name="comb_gallery_layout">
+     layout="topleft"
+     left="7"
+     name="combination_view_inventory"
+     top_delta="0"
+     visible="false"
+     width="312">
+     <layout_stack
+      follows="all"
+      layout="topleft"
+      height="372"
+      width="312"
+      animate="false"
+      drag_handle_gap="13"
+      drag_handle_thickness="6"
+      drag_handle_first_indent="18"
+      drag_handle_second_indent="18"
+      drag_handle_shift="5"
+      show_drag_handle="true"
+      top="0"
+      left="0"
+      orientation="vertical">
+       <layout_panel
+        border="false"
+        bevel_style="in"
+        user_resize="true"
+        auto_resize="true"
+        height="246"
+        width="312"
+        min_width="150"
+        name="comb_gallery_layout">
         <panel
          class="inventory_gallery"
          filename="panel_inventory_gallery.xml"
          left="0"
          top="1"
          height="246"
-         xwidth="304"
+         width="312"
          name="comb_gallery_view_inv"
          background_visible="true"
          follows="all"
          layout="topleft">
         </panel>
-      </layout_panel>
-      <layout_panel
-       border="false"
-       bevel_style="in"
-       user_resize="true"
-       auto_resize="true"
-       height="126"
-       xwidth="306"
-       min_height="100"
-       name="comb_inventory_layout">
+       </layout_panel>
+       <layout_panel
+        border="false"
+        bevel_style="in"
+        user_resize="true"
+        auto_resize="true"
+        height="126"
+        width="312"
+        min_height="100"
+        name="comb_inventory_layout">
         <single_folder_inventory_panel
          name="comb_single_folder_inv"
          follows="all"
          left="0"
          top="1"
          height="126"
-         xwidth="304"
+         width="312"
          layout="topleft"
          show_item_link_overlays="true"
          bg_opaque_color="DkGray2"
@@ -329,14 +346,14 @@
          border="false"
          bevel_style="none"
          scroll.reserve_scroll_corner="false">
-          <item
-           single_folder_mode="true"
-           folder_indentation="-8"/>
-          <folder
-           single_folder_mode="true"
-           folder_indentation="-8"/>
+         <item
+          single_folder_mode="true"
+          folder_indentation="-8"/>
+         <folder
+          single_folder_mode="true"
+          folder_indentation="-8"/>
         </single_folder_inventory_panel>
-      </layout_panel>
-    </layout_stack>
-  </panel>
+       </layout_panel>
+     </layout_stack>
+    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index c1c534f734..dfd3e3bf9d 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -1,113 +1,137 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- name="objects panel"
- label="Things"
- layout="topleft"
- follows="all"
- height="570"
- min_height="350"
- min_width="240">
-  <panel
-   name="sidepanel_inventory_panel"
-   layout="topleft"
-   follows="all"
-   top="0"
-   height="570"
-   default_tab_group="1">
-    <layout_stack
-     name="inventory_layout_stack"
-     layout="topleft"
-     follows="all"
-     top="0"
-     height="560"
-     tab_group="1"
-     orientation="vertical">
-      <layout_panel
-       name="main_inventory_layout_panel"
-       layout="topleft"
-       follows="bottom|left|right"
-       height="300"
-       auto_resize="true"
-       user_resize="true"
-       min_dim="150">
-        <panel
-         name="panel_main_inventory"
-         class="panel_main_inventory"
-         filename="panel_main_inventory.xml"
-         layout="topleft"
-         follows="all"
-         top="0"
-         height="300" />
-      </layout_panel>
-      <layout_panel
-       name="inbox_layout_panel"
-       follows="left|right|top"
-       layout="topleft"
-       min_dim="35"
-       expanded_min_dim="90"
-       auto_resize="false"
-       user_resize="true" >
-        <panel
-         name="marketplace_inbox"
-         class="panel_marketplace_inbox"
-         layout="topleft"
-         follows="all" >
-          <string name="InboxLabelWithArg">Received items ([NUM])</string>
-          <string name="InboxLabelNoArg">Received items</string>
-          <button
-           name="inbox_btn"
-           control_name="InventoryInboxToggleState"
-           label="Received items"
-           font="SansSerifMedium"
-           follows="top|left|right"
-           height="35"
-           image_unselected="MarketplaceBtn_Off"
-           image_selected="MarketplaceBtn_Selected"
-           pad_left="35"
-           left="10"
-           right="-10"
-           halign="left"
-           is_toggle="true"
-           tab_stop="false"
-           handle_right_mouse="false" />
-          <text
-           name="inbox_fresh_new_count"
-           font="SansSerifMedium"
-           type="string"
-           length="1"
-           follows="right|top"
-           layout="topleft"
-           height="13"
-           top_pad="0"
-           top="10"
-           right="-20"
-           halign="right">
-            [NUM] new
-          </text>
-          <panel
-           name="inbox_inventory_placeholder_panel"
-           bg_opaque_color="InventoryBackgroundColor"
-           background_visible="true"
-           background_opaque="true"
-           follows="all"
-           top="36"
-           right="-10"
-           bottom="10"
-           tool_tip="Drag and drop items to your inventory to use them" >
-            <text
-             name="inbox_inventory_placeholder"
-             type="string"
-             follows="all"
-             layout="topleft"
-             top="1"
-             bottom="-1"
-             wrap="true"
-             halign="center">
-              Purchases from the marketplace will be delivered here.
-            </text>
-          </panel>
-        </panel>
-      </layout_panel>
-    </layout_stack>
-  </panel>
+	  follows="all"
+	  height="570"
+	  label="Things"
+	  layout="topleft"
+	  min_height="350"
+	  min_width="240"
+	  name="objects panel"
+	  width="358">
+    <panel
+		 follows="all"
+		 layout="topleft"
+		 left="0"
+		 name="sidepanel_inventory_panel"
+		 top="0"
+		 label=""
+		 height="570"
+		 visible="true"
+		 default_tab_group="1"
+		 width="395">
+      <layout_stack
+              follows="left|right|top|bottom"
+              layout="topleft"
+              left="0"
+              top="0"
+							tab_group="1"
+              orientation="vertical"
+              name="inventory_layout_stack"
+              height="565"
+              width="395">
+             <layout_panel
+                 name="main_inventory_layout_panel"
+                 layout="topleft"
+                 auto_resize="true"
+                 user_resize="true"
+                 min_dim="150"
+                 width="395"
+                 follows="bottom|left|right"
+                 height="300">
+                 <panel
+                      class="panel_main_inventory"
+                      filename="panel_main_inventory.xml"
+                      follows="all"
+                      layout="topleft"
+                      left="0"
+                      name="panel_main_inventory"
+                      top="0"
+                      label=""
+                      height="300"
+                      width="395" />
+             </layout_panel>
+			    <layout_panel
+                 width="355"
+                 layout="topleft"
+                 auto_resize="false"
+                 user_resize="true"
+                 follows="left|right|top"
+                 name="inbox_layout_panel"
+                 visible="true"
+                 min_dim="35"
+                 expanded_min_dim="90"
+                 height="235">
+                 <panel
+                      follows="all"
+                      layout="topleft"
+                      left="0"
+                      name="marketplace_inbox"
+                      class="panel_marketplace_inbox"
+                      top="0"
+                      label=""
+                      height="235"
+                      width="330">
+                     <string name="InboxLabelWithArg">Received items ([NUM])</string>
+                     <string name="InboxLabelNoArg">Received items</string>
+                     <button
+                        control_name="InventoryInboxToggleState"
+                        label="Received items"
+												font="SansSerifMedium"
+                        name="inbox_btn"
+                        height="35"
+                        width="308"
+                        image_unselected="MarketplaceBtn_Off"
+                        image_selected="MarketplaceBtn_Selected"
+                        halign="left"
+                        handle_right_mouse="false"
+                        follows="top|left|right"
+                        is_toggle="true"
+                        tab_stop="false"
+                        pad_left="35"
+                        top="0"
+                        left="10" />
+                     <text
+                        type="string"
+                        length="1"
+                        follows="right|top"
+                        layout="topleft"
+                        height="13"
+                        top="10"
+                        right="-20"
+                        name="inbox_fresh_new_count"
+                        font="SansSerifMedium"
+                        halign="right"
+                        top_pad="0"
+                        width="300">
+                        [NUM] new
+                     </text>
+                     <panel
+                        name="inbox_inventory_placeholder_panel"
+                        follows="all"
+                        left="10"
+                        bottom="235"
+                        width="308"
+                        top="35"
+                        bg_opaque_color="InventoryBackgroundColor"
+                        background_visible="true"
+                        background_opaque="true"
+                        tool_tip="Drag and drop items to your inventory to use them"
+                        >
+                        <text name="inbox_inventory_placeholder"
+															type="string"
+															follows="all"
+															layout="topleft"
+															top="0"
+															left="0"
+															width="308"
+															height="200"
+															wrap="true"
+															halign="center">
+Purchases from the marketplace will be delivered here.
+												</text>
+                    </panel>
+                 </panel>
+             </layout_panel>
+         </layout_stack>
+	</panel>
 </panel>
-- 
cgit v1.2.3


From 7607047a95a8b1cb89e3007138fbb00986067c2b Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 16 Jun 2023 23:42:45 +0300
Subject: SL-19863 FIXED Items are not copied when attempting to paste into
 gallery mode

---
 indra/newview/skins/default/xui/en/menu_inventory.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 8374e63219..e650c10603 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -386,7 +386,8 @@
      layout="topleft"
      name="open_in_current_window">
         <menu_item_call.on_click
-         function="Inventory.OpenSelectedFolder"/>
+         function="Inventory.DoToSelected"
+         parameter="open_in_current_window" />
     </menu_item_call>
     <menu_item_call
      label="Open in new window"
-- 
cgit v1.2.3


From 2a035c080dec2aa16b9628aac7b120e4f15135c2 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 16 Jun 2023 08:42:23 +0200
Subject: SL-18977 Borders of inventory view in inventory floater seem to be
 cut a bit

---
 .../default/xui/en/panel_inventory_gallery.xml     | 17 +++----
 .../skins/default/xui/en/panel_main_inventory.xml  | 57 +++++++++-------------
 .../skins/default/xui/en/sidepanel_inventory.xml   | 55 +++++++++------------
 3 files changed, 51 insertions(+), 78 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
index 2b80e30696..22cc926e75 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
@@ -6,19 +6,15 @@
    follows="all"
    height="390"
    name="Inventory Gallery"
-   layout="topleft"
-   left="0"
-   top="0"
-   width="404">
+   layout="topleft">
   <text
     type="string"
     clip_partial="false"
-    follows="left|top"
+    follows="all"
     layout="topleft"
-    left="13"
     name="empty_txt"
-    top="0"
-    height="32"
+    height="390"
+    halign="center"
     valign="center"
     parse_urls="true"
     wrap="true">
@@ -28,10 +24,9 @@
    follows="all"
    height="390"
    layout="topleft"
-   left="4"
+   left="0"
    top="0"
    name="gallery_scroll_panel"
-   opaque="false"
-   top_pad="0">
+   opaque="false">
   </scroll_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 64b885c222..b735dcf528 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -6,8 +6,7 @@
  layout="topleft"
  min_height="300"
  min_width="240"
- name="main inventory panel"
- width="355">
+ name="main inventory panel">
   <panel.string
    name="Itemcount">
   </panel.string>
@@ -27,18 +26,18 @@
   <panel.string name="default_mode_btn">Multi_Folder_Mode</panel.string>
   <panel.string name="single_folder_mode_btn">Single_Folder_Mode</panel.string>
   <text
-		     type="string"
-		     length="1"
-		     follows="left|top|right"
-		     height="13"
-		     layout="topleft"
-    		 left="12"
-		     name="ItemcountText"
-		     font="SansSerifMedium"
-		     text_color="InventoryItemLinkColor"
-		     use_ellipses="true"
-		     top_pad="0"
-		     width="300">
+     type="string"
+     length="1"
+     follows="left|top|right"
+     height="13"
+     layout="topleft"
+  	 left="12"
+  	 right="-12"
+     name="ItemcountText"
+     font="SansSerifMedium"
+     text_color="InventoryItemLinkColor"
+     use_ellipses="true"
+     top_pad="0">
     Items:
   </text>
   <layout_stack
@@ -47,6 +46,7 @@
    animate="false"
    top_pad="10"
    left="2"
+   right="-4"
    orientation="horizontal">
     <layout_panel
      border="false"
@@ -100,7 +100,7 @@
       bevel_style="in"
       user_resize="false"
       height="25"
-      width="375"
+      width="381"
       visible="true">
       <combo_box
        height="23"
@@ -203,10 +203,10 @@
      halign="center"
      height="372"
      layout="topleft"
-     left="7"
+     left="3"
+     right="-3"
      name="default_inventory_panel"
-     top_pad="10"
-     width="312">
+     top_pad="5">
       <tab_container
        follows="all"
        halign="center"
@@ -217,8 +217,7 @@
        tab_height="30"
        tab_position="top"
        tab_min_width="100"
-       top="0"
-       width="312">
+       top="0">
         <inventory_panel
          bg_opaque_color="DkGray2"
          bg_alpha_color="DkGray2"
@@ -226,17 +225,14 @@
          border="false"
          bevel_style="none"
          follows="all"
-         height="338"
          label="MY INVENTORY"
          help_topic="my_inventory_tab"
          layout="topleft"
-         left="0"
          name="All Items"
          sort_order_setting="InventorySortOrder"
          show_item_link_overlays="true"
          preinitialize_views="false"
-         top="16"
-         width="288">
+         scroll.reserve_scroll_corner="false">
             <folder double_click_override="true"/>
         </inventory_panel>
         <recent_inventory_panel
@@ -246,15 +242,13 @@
          border="false"
          bevel_style="none"
          follows="all"
-         height="338"
          label="RECENT"
          help_topic="recent_inventory_tab"
          layout="topleft"
-         left_delta="0"
          name="Recent Items"
          show_item_link_overlays="true"
          preinitialize_views="false"
-         width="290">
+         scroll.reserve_scroll_corner="false">
             <folder double_click_override="true"/>
         </recent_inventory_panel>
         <inventory_panel
@@ -263,7 +257,6 @@
          show_empty_message="false"
          follows="all"
          layout="topleft"
-         width="290"
          bg_opaque_color="DkGray2"
          bg_alpha_color="DkGray2"
          background_visible="true"
@@ -283,13 +276,11 @@
      left="7"
      name="combination_view_inventory"
      top_delta="0"
-     visible="false"
-     width="312">
+     visible="false">
      <layout_stack
       follows="all"
       layout="topleft"
       height="372"
-      width="312"
       animate="false"
       drag_handle_gap="13"
       drag_handle_thickness="6"
@@ -306,7 +297,6 @@
         user_resize="true"
         auto_resize="true"
         height="246"
-        width="312"
         min_width="150"
         name="comb_gallery_layout">
         <panel
@@ -315,7 +305,6 @@
          left="0"
          top="1"
          height="246"
-         width="312"
          name="comb_gallery_view_inv"
          background_visible="true"
          follows="all"
@@ -328,7 +317,6 @@
         user_resize="true"
         auto_resize="true"
         height="126"
-        width="312"
         min_height="100"
         name="comb_inventory_layout">
         <single_folder_inventory_panel
@@ -337,7 +325,6 @@
          left="0"
          top="1"
          height="126"
-         width="312"
          layout="topleft"
          show_item_link_overlays="true"
          bg_opaque_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index dfd3e3bf9d..76d0ffcb8e 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -6,8 +6,7 @@
 	  layout="topleft"
 	  min_height="350"
 	  min_width="240"
-	  name="objects panel"
-	  width="358">
+	  name="objects panel">
     <panel
 		 follows="all"
 		 layout="topleft"
@@ -17,25 +16,22 @@
 		 label=""
 		 height="570"
 		 visible="true"
-		 default_tab_group="1"
-		 width="395">
+		 default_tab_group="1">
       <layout_stack
               follows="left|right|top|bottom"
               layout="topleft"
               left="0"
               top="0"
-							tab_group="1"
+              tab_group="1"
               orientation="vertical"
               name="inventory_layout_stack"
-              height="565"
-              width="395">
+              height="560">
              <layout_panel
                  name="main_inventory_layout_panel"
                  layout="topleft"
                  auto_resize="true"
                  user_resize="true"
                  min_dim="150"
-                 width="395"
                  follows="bottom|left|right"
                  height="300">
                  <panel
@@ -47,11 +43,9 @@
                       name="panel_main_inventory"
                       top="0"
                       label=""
-                      height="300"
-                      width="395" />
+                      height="300" />
              </layout_panel>
 			    <layout_panel
-                 width="355"
                  layout="topleft"
                  auto_resize="false"
                  user_resize="true"
@@ -69,17 +63,15 @@
                       class="panel_marketplace_inbox"
                       top="0"
                       label=""
-                      height="235"
-                      width="330">
+                      height="235">
                      <string name="InboxLabelWithArg">Received items ([NUM])</string>
                      <string name="InboxLabelNoArg">Received items</string>
                      <button
                         control_name="InventoryInboxToggleState"
                         label="Received items"
-												font="SansSerifMedium"
+                        font="SansSerifMedium"
                         name="inbox_btn"
                         height="35"
-                        width="308"
                         image_unselected="MarketplaceBtn_Off"
                         image_selected="MarketplaceBtn_Selected"
                         halign="left"
@@ -89,7 +81,8 @@
                         tab_stop="false"
                         pad_left="35"
                         top="0"
-                        left="10" />
+                        left="5"
+                        right="-5" />
                      <text
                         type="string"
                         length="1"
@@ -101,34 +94,32 @@
                         name="inbox_fresh_new_count"
                         font="SansSerifMedium"
                         halign="right"
-                        top_pad="0"
-                        width="300">
+                        top_pad="0">
                         [NUM] new
                      </text>
                      <panel
                         name="inbox_inventory_placeholder_panel"
                         follows="all"
-                        left="10"
-                        bottom="235"
-                        width="308"
+                        left="5"
+                        right="-5"
                         top="35"
+                        height="200"
                         bg_opaque_color="InventoryBackgroundColor"
                         background_visible="true"
                         background_opaque="true"
                         tool_tip="Drag and drop items to your inventory to use them"
                         >
                         <text name="inbox_inventory_placeholder"
-															type="string"
-															follows="all"
-															layout="topleft"
-															top="0"
-															left="0"
-															width="308"
-															height="200"
-															wrap="true"
-															halign="center">
-Purchases from the marketplace will be delivered here.
-												</text>
+                            type="string"
+                            follows="all"
+                            layout="topleft"
+                            top="0"
+                            height="200"
+                            wrap="true"
+                            halign="center"
+                            valign="center">
+                          Purchases from the marketplace will be delivered here.
+                        </text>
                     </panel>
                  </panel>
              </layout_panel>
-- 
cgit v1.2.3


From f30ae5c7812f5449a327a470fd4acaed7546d853 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 23 Jun 2023 21:59:55 +0300
Subject: SL-19914 Inventory gallery Tab support

---
 indra/newview/skins/default/xui/en/panel_inventory_gallery.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
index 22cc926e75..ed04e12193 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
@@ -26,6 +26,7 @@
    layout="topleft"
    left="0"
    top="0"
+   tab_stop="true"
    name="gallery_scroll_panel"
    opaque="false">
   </scroll_container>
-- 
cgit v1.2.3


From 65fe37a93029e17f45e488619a5e589a2983757f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 24 Jun 2023 01:49:27 +0300
Subject: SL-19604 Fix gallery view having huge ident at the bottom

---
 .../newview/skins/default/xui/en/panel_main_inventory.xml  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index b735dcf528..f7a9c552cc 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -271,7 +271,7 @@
     <panel
      follows="all"
      halign="center"
-     height="372"
+     height="375"
      layout="topleft"
      left="7"
      name="combination_view_inventory"
@@ -280,9 +280,9 @@
      <layout_stack
       follows="all"
       layout="topleft"
-      height="372"
+      height="375"
+      name="combination_view_stack"
       animate="false"
-      drag_handle_gap="13"
       drag_handle_thickness="6"
       drag_handle_first_indent="18"
       drag_handle_second_indent="18"
@@ -296,7 +296,7 @@
         bevel_style="in"
         user_resize="true"
         auto_resize="true"
-        height="246"
+        height="248"
         min_width="150"
         name="comb_gallery_layout">
         <panel
@@ -304,7 +304,7 @@
          filename="panel_inventory_gallery.xml"
          left="0"
          top="1"
-         height="246"
+         height="248"
          name="comb_gallery_view_inv"
          background_visible="true"
          follows="all"
@@ -316,7 +316,7 @@
         bevel_style="in"
         user_resize="true"
         auto_resize="true"
-        height="126"
+        height="127"
         min_height="100"
         name="comb_inventory_layout">
         <single_folder_inventory_panel
@@ -324,7 +324,7 @@
          follows="all"
          left="0"
          top="1"
-         height="126"
+         height="127"
          layout="topleft"
          show_item_link_overlays="true"
          bg_opaque_color="DkGray2"
-- 
cgit v1.2.3


From cd0c40c71af767dd66694dc3329e08823aa6b6e7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 27 Jun 2023 00:24:13 +0300
Subject: SL-19904 Outfit gallery keyboard support

---
 .../skins/default/xui/en/panel_outfit_gallery.xml  | 42 +---------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
index e3790ae09b..e951d25391 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
@@ -40,50 +40,10 @@
    layout="topleft"
    left="4"
    top="0"
+   tab_stop="true"
    name="gallery_scroll_panel"
    opaque="false"
    top_pad="0">
-   <!--outfit_gallery_item
-    layout="topleft"
-    left="10"
-    name="preview_outfit1"
-    height="175"
-    width="150"
-    follows="left|top"/-->
-     <!--layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="0" name="top_gallery_stack" orientation="horizontal">
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-    </layout_stack>
-    <layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="190" name="top_gallery_stack" orientation="horizontal">
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-    </layout_stack>
-     <layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="380" name="top_gallery_stack" orientation="horizontal">
-       <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
-         <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
-       </layout_panel>
-       <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-         <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-       </layout_panel>
-       <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-         <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-       </layout_panel>
-     </layout_stack-->
-    <!--</panel>-->  
   </scroll_container> 
   <panel
      background_visible="true"
-- 
cgit v1.2.3


From 4a5ffb70c448f4fdf3e937c0da07ed8cb1d976e9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 27 Jun 2023 22:04:34 +0300
Subject: SL-19274 Update 'switch view' label

---
 indra/newview/skins/default/xui/en/floater_inventory_settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
index bfac79ac46..2e619d91fb 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
@@ -63,7 +63,7 @@
      <radio_item
       height="20"
       follows="left|top"
-      label="Switch view"
+      label="Switches view"
       label_text.text_color="White"
       layout="topleft"
       left_delta="0"
-- 
cgit v1.2.3


From 7c100d54dda03db62a8d2c8be6a5e02ea9280f9b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 29 Jun 2023 02:33:58 +0300
Subject: SL-19928 Make thumbnail selection failures more user friendly

---
 .../skins/default/xui/en/floater_texture_ctrl.xml        | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'indra/newview/skins')

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 3a66911389..dc68bd0d4a 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -83,6 +83,22 @@
      top_pad="4">
         [DIMENSIONS]
     </text>
+    <text
+     type="string"
+     text_color="Yellow"
+     length="1"
+     word_wrap="true"
+     follows="left|top"
+     height="56"
+     width="164"
+     layout="topleft"
+     left="8"
+     name="over_limit_lbl"
+     visible="false"
+     top_delta="0">
+        Selected texture is [TEXDIM], inventory image must be square, between [MINTEXDIM] and [MAXTEXDIM].
+    </text>
+    
 <!--  middle: inventory mode -->
 
     <button
-- 
cgit v1.2.3


From f149b87fcc152a7e6232d1a2eb81bb2ac72697da Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 29 Jun 2023 23:53:22 +0300
Subject: SL-19929 New inventory feature notification

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
new file mode 100644
index 0000000000..370a08f16a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ height="130"
+ width="300"
+ layout="topleft"
+ name="floater_new_feature_notification"
+ title="NEW FEATURE"
+ show_title="false"
+ header_height="0"
+ bg_opaque_image="Window_NoTitle_Foreground"
+ bg_alpha_image="Window_NoTitle_Background"
+ can_resize="false"
+ can_drag_on_left="false"
+ can_minimize="false"
+ can_close="false">
+  <text
+   type="string"
+   length="1"
+   follows="top|left|right"
+   font="SansSerifLargeBold"
+   text_color="White"
+   layout="topleft"
+   left="10"
+   height="14"
+   top="10"
+   right="-10"
+   name="title_txt">
+New inventory features
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="top|left|right"
+   text_color="White"
+   layout="topleft"
+   left="10"
+   height="40"
+   top_pad="14"
+   right="-10"
+   word_wrap="true"
+   name="description_txt">
+You can now add preview images to inventory items and view a folder in its own window.
+Learn more in this [https://community.secondlife.com/blogs/entry/13637-new-features-inventory-item-preview-and-single-folder-view/ blogpost]
+  </text>
+  <button
+   follows="bottom|left|right"
+   layout="topleft"
+   height="24"
+   label="Got it!"
+   left="104"
+   bottom="-10"
+   name="close_btn"
+   width="90"/>
+</floater>
-- 
cgit v1.2.3


From ab18293d35c4ce391f65efaa65be53cdbe84f550 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 30 Jun 2023 00:42:55 +0300
Subject: SL-19929 Picker's warning small adjustment

---
 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

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 dc68bd0d4a..771113d989 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -96,7 +96,7 @@
      name="over_limit_lbl"
      visible="false"
      top_delta="0">
-        Selected texture is [TEXDIM], inventory image must be square, between [MINTEXDIM] and [MAXTEXDIM].
+        Selected texture is [TEXDIM]. Inventory image must be square, between [MINTEXDIM] and [MAXTEXDIM].
     </text>
     
 <!--  middle: inventory mode -->
-- 
cgit v1.2.3


From 87c337047dbfcdf11a04b2395b0165db24238823 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 1 Aug 2023 18:31:29 +0300
Subject: SL-20100 remove inappropriate param to get rid of parse warning

---
 indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index ec2961b0f3..726cb38481 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -54,7 +54,6 @@
   <text
     name="item_name"
     font="SansSerif"
-    max_length_bytes="127"
     use_ellipses="true"
     follows="left|top|right"
     layout="topleft"
-- 
cgit v1.2.3


From d32e685d96e19be3711e09ab626203d248d3594b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 18 Aug 2023 18:51:42 +0300
Subject: SL-19929 Small rework of a 'feature' notification

To make multiple parallel features possible
---
 .../default/xui/en/floater_new_feature_notification.xml      | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
index 370a08f16a..5f0eeab71c 100644
--- a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
+++ b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
@@ -13,6 +13,13 @@
  can_drag_on_left="false"
  can_minimize="false"
  can_close="false">
+    <floater.string name="title_txt_inventory">
+New inventory features
+    </floater.string>
+    <floater.string name="description_txt_inventory">
+You can now add preview images to inventory items and view a folder in its own window.
+Learn more in this [https://community.secondlife.com/blogs/entry/13637-new-features-inventory-item-preview-and-single-folder-view/ blogpost]
+    </floater.string>
   <text
    type="string"
    length="1"
@@ -25,7 +32,7 @@
    top="10"
    right="-10"
    name="title_txt">
-New inventory features
+New feature
   </text>
   <text
    type="string"
@@ -39,8 +46,7 @@ New inventory features
    right="-10"
    word_wrap="true"
    name="description_txt">
-You can now add preview images to inventory items and view a folder in its own window.
-Learn more in this [https://community.secondlife.com/blogs/entry/13637-new-features-inventory-item-preview-and-single-folder-view/ blogpost]
+Feature description
   </text>
   <button
    follows="bottom|left|right"
-- 
cgit v1.2.3


From 71a02a8d359f9a916f3119fa947addec07260c28 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 30 Aug 2023 22:26:58 +0300
Subject: SL-20242 UI overlap in object profile with DebugPermissions on

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_task_properties.xml b/indra/newview/skins/default/xui/en/floater_task_properties.xml
index 4b5c207577..56c236eab4 100644
--- a/indra/newview/skins/default/xui/en/floater_task_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_task_properties.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="570"
+ height="590"
  layout="topleft"
  name="Task Properties"
  help_topic="item+properties"
@@ -17,7 +17,7 @@
    name="sidepanel"
    top="20"
    label=""
-   height="550"
+   height="570"
    visible="true"
    width="330">
  </panel>
-- 
cgit v1.2.3


From f24f72d2f9db7490b169daea16f8ab8400ca12b4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 6 Sep 2023 02:56:11 +0300
Subject: SL-19826 Gallery multiselect support Part#3

wip
---
 .../default/xui/en/menu_gallery_inventory.xml      | 26 ++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
index 46afa3821b..d82c453e5f 100644
--- a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -453,30 +453,38 @@
       <menu_item_call.on_click
        function="Inventory.FileUploadLocation"
         parameter="texture" />
+      <menu_item_call.on_visible
+       function="Inventory.CanSetUploadLocation" />
     </menu_item_call>
     <menu_item_call
      label="Sound uploads"
      layout="topleft"
      name="Sound uploads">
-    <menu_item_call.on_click
-     function="Inventory.FileUploadLocation"
-     parameter="sound" />
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+       parameter="sound" />
+      <menu_item_call.on_visible
+       function="Inventory.CanSetUploadLocation" />
     </menu_item_call>
     <menu_item_call
      label="Animation uploads"
      layout="topleft"
      name="Animation uploads">
-    <menu_item_call.on_click
-     function="Inventory.FileUploadLocation"
-     parameter="animation" />
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+       parameter="animation" />
+      <menu_item_call.on_visible
+       function="Inventory.CanSetUploadLocation" />
     </menu_item_call>
     <menu_item_call
      label="Model uploads"
      layout="topleft"
      name="Model uploads">
-    <menu_item_call.on_click
-     function="Inventory.FileUploadLocation"
-     parameter="model" />
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+       parameter="model" />
+      <menu_item_call.on_visible
+       function="Inventory.CanSetUploadLocation" />
     </menu_item_call>
   </menu>
 	<menu_item_separator
-- 
cgit v1.2.3


From cfb69846f1e8309ed86d4a18eb26a889f6dbaccc Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 9 Sep 2023 00:00:22 +0300
Subject: SL-20261 Allow and resize existing textures as necessary for
 thumbnails

---
 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

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 771113d989..8081af6673 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -96,7 +96,7 @@
      name="over_limit_lbl"
      visible="false"
      top_delta="0">
-        Selected texture is [TEXDIM]. Inventory image must be square, between [MINTEXDIM] and [MAXTEXDIM].
+        Selected texture is [TEXDIM]. Inventory image must be square, no less than [MINTEXDIM].
     </text>
     
 <!--  middle: inventory mode -->
-- 
cgit v1.2.3


From b5c745185f4e3d2d215b5a171dc96a57d01eb079 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 12 Sep 2023 19:51:13 +0300
Subject: SL-20162 Option for debuging folder version in UI

Shows folder's data instead of a suffix.
Will need either a new inventory window or to toggle UI debug on early.
---
 indra/newview/skins/default/xui/en/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4cdc8f2835..04b374cb00 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2355,6 +2355,7 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="InventoryMarketplaceListingsNoItems">
         Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace].
 	</string>
+    <string name="InventoryFolderDebug">( F:[FOLDER_COUNT] I:[ITEMS_COUNT] V:[VERSION] DC:[VIEWER_DESCENDANT_COUNT]/[SERVER_DESCENDANT_COUNT] )</string>
 	<string name="InventoryItemsCount">( [ITEMS_COUNT] Items )</string>
 	<string name="Marketplace Validation Log"></string>
 	<string name="Marketplace Validation Warning Stock">stock folder must be contained by a version folder</string>
-- 
cgit v1.2.3


From 69a98a8465f910d58911456dfe840a7b829ccc65 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 13 Sep 2023 18:50:42 +0300
Subject: SL-20278 Disconnect saving MFA from saving password

---
 .../newview/skins/default/xui/en/notifications.xml | 29 ++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ef720e65e3..204fead7e0 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11988,16 +11988,41 @@ Packing: [PACK_TIME]s [PSIZE]KB
 Unpacking: [UNPACK_TIME]s [USIZE]KB
     <tag>fail</tag>
   </notification>
-  
+
+    <notification
+     icon="alertmodal.tga"
+     label="Prompt for MFA Token"
+     name="PromptMFAToken"
+     type="alertmodal">
+        [MESSAGE]
+        <tag>confirm</tag>
+        <form name="form">
+            <input name="token" type="text" width="400" />
+            <button
+             default="true"
+             index="0"
+             name="continue"
+             text="Continue"/>
+            <button
+             index="1"
+             name="cancel"
+             text="Cancel"/>
+        </form>
+    </notification>
+
   <notification
    icon="alertmodal.tga"
    label="Prompt for MFA Token"
-   name="PromptMFAToken"
+   name="PromptMFATokenWithSave"
    type="alertmodal">
     [MESSAGE]
     <tag>confirm</tag>
     <form name="form">
       <input name="token" type="text" width="400" />
+      <ignore
+       name="ignore"
+       checkbox_only="true"
+       text="Remember this computer for 30 days."/>
       <button
        default="true"
        index="0"
-- 
cgit v1.2.3