From 7e536f4af45d71e5185fc3e3189ed0b7d603ee5d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 23 Apr 2024 02:14:08 +0300
Subject: viewer#1300 Rename landmark favorites tab

To not acuse confusion with favorites
---
 indra/newview/skins/default/xui/en/panel_places.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index a3a2f7c47e..1bda5c019c 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -19,7 +19,7 @@ background_visible="true"
    value="VISITED" />
   <string
    name="favorites_tab_title"
-   value="FAVORITES" />
+   value="FAVORITES BAR" />
   <string
    name="tooltip_trash_items"
    value="Remove selected landmark or folder" />
-- 
cgit v1.2.3


From a0b0f207779d1c8c3354af0a41d05dc6b188a033 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 23 Apr 2024 02:17:53 +0300
Subject: viewer#1300 Update Gear Menu Items

---
 .../skins/default/xui/en/menu_inventory_gear_default.xml      | 11 +++++++++++
 .../skins/default/xui/en/menu_inventory_view_default.xml      | 11 -----------
 2 files changed, 11 insertions(+), 11 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 e249acaccd..d17fbf84b3 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
@@ -138,4 +138,15 @@
          function="Inventory.GearDefault.Visible"
          parameter="multi_folder_view" />
     </menu_item_call>
+    <menu_item_separator/>
+    <menu_item_check
+     label="Inventory settings..."
+     name="inv_settings">
+      <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>
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 33cf01493d..97f53d3a17 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
@@ -100,15 +100,4 @@
          function="Inventory.GearDefault.Visible"
          parameter="single_folder_view" />
     </menu_item_check>
-    <menu_item_separator/>
-    <menu_item_check
-     label="Inventory settings..."
-     name="inv_settings">
-        <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 384d694aba523218490ec48c22d97b63acbffd6f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 23 Apr 2024 23:28:58 +0300
Subject: viewer#1300 Inventory favorites context menu

---
 .../skins/default/xui/en/menu_gallery_inventory.xml    | 16 ++++++++++++++++
 indra/newview/skins/default/xui/en/menu_inventory.xml  | 18 +++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

(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 c11f1c88cb..929c626947 100644
--- a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -442,6 +442,22 @@
      function="Inventory.DoToSelected"
      parameter="ungroup_folder_items" />
   </menu_item_call>
+  <menu_item_call
+   label="Add to Favorites"
+   layout="topleft"
+   name="Add to Favorites">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="add_to_favorites" />
+  </menu_item_call>
+  <menu_item_call
+   label="Remove from Favorites"
+   layout="topleft"
+   name="Remove from Favorites">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="remove_from_favorites" />
+  </menu_item_call>
   <menu
    label="Use as default for"
    layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 35ec0bf9e1..ef5b984064 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -926,7 +926,7 @@
          function="Inventory.EnvironmentEnabled" />
       </menu_item_call>
     </menu>
-  </menu>  
+  </menu>
   <menu_item_call
    label="Create folder from selected"
    layout="topleft"
@@ -943,6 +943,22 @@
      function="Inventory.DoToSelected"
      parameter="ungroup_folder_items" />
   </menu_item_call>
+  <menu_item_call
+   label="Add to Favorites"
+   layout="topleft"
+   name="Add to Favorites">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="add_to_favorites" />
+  </menu_item_call>
+  <menu_item_call
+   label="Remove from Favorites"
+   layout="topleft"
+   name="Remove from Favorites">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="remove_from_favorites" />
+  </menu_item_call>
   <menu
    label="Use as default for"
    layout="topleft"
-- 
cgit v1.2.3


From cea6eeeede9f687ca195cc9b9e778fd6784afbe2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 25 Apr 2024 04:46:42 +0300
Subject: viewer#1300 'Star' favorites in inventory

image is WIP
---
 indra/newview/skins/default/xui/en/floater_preview_trash.xml            | 2 ++
 indra/newview/skins/default/xui/en/widgets/folder_view_item.xml         | 2 ++
 indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml | 2 ++
 3 files changed, 6 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_preview_trash.xml b/indra/newview/skins/default/xui/en/floater_preview_trash.xml
index f1c87c8c5a..f62e04baf2 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_trash.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_trash.xml
@@ -29,6 +29,8 @@
       bevel_style="none"
       scroll.reserve_scroll_corner="false">
     <folder folder_arrow_image="Folder_Arrow"
+            favorite_image="Favorite_Star_Active"
+            favorite_content_image="Favorite_Star_Off"
             folder_indentation="8"
             item_height="20"
             item_top_pad="4"
diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
index b598bbccd8..1bcd8886b4 100644
--- a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <folder_view_item
   folder_arrow_image="Folder_Arrow"
+  favorite_image="Favorite_Star_Active"
+  favorite_content_image="Favorite_Star_Off"
   folder_indentation="8"
   item_height="20" 
   item_top_pad="4"
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
index 27ec6ded81..8f9017f9ce 100644
--- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inbox_folder_view_folder
   folder_arrow_image="Folder_Arrow"
+  favorite_image="Favorite_Star_Active"
+  favorite_content_image="Favorite_Star_Off"
   folder_indentation="8"
   item_height="20" 
   item_top_pad="4"
-- 
cgit v1.2.3


From 645811c6ef3134a540fc1bc7d32d7bdb8fa35046 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 1 May 2024 03:16:47 +0300
Subject: Viewer#1301 Implement Inventory Favorites Tab WIP

---
 .../skins/default/xui/en/panel_main_inventory.xml        | 16 ++++++++++++++++
 indra/newview/skins/default/xui/en/strings.xml           |  5 +++--
 2 files changed, 19 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 190ff4ef28..9d55cae28d 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -268,6 +268,22 @@
          scroll.reserve_scroll_corner="false">
             <folder double_click_override="true"/>
         </inventory_panel>
+        <favorites_inventory_panel
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         follows="all"
+         label="FAVORITES"
+         help_topic="recent_inventory_tab"
+         layout="topleft"
+         name="Favorites"
+         show_item_link_overlays="true"
+         preinitialize_views="false"
+         scroll.reserve_scroll_corner="false">
+          <folder double_click_override="true"/>
+        </favorites_inventory_panel>
       </tab_container>
     </panel>
     <panel
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b1feb7368f..2bfe1d0711 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2306,8 +2306,9 @@ For AI Character: Get the closest navigable point to the point provided.
 
 	<!-- inventory -->
 	<string name="InventoryNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search].</string>
-	<string name="InventoryNoMatchingRecentItems">Didn't find what you're looking for? Try [secondlife:///app/inventory/filters Show filters].</string>	
-	<string name="PlacesNoMatchingItems">To add a place to your landmarks, click the star to the right of the location name.</string>
+	<string name="InventoryNoMatchingRecentItems">Didn't find what you're looking for? Try [secondlife:///app/inventory/filters Show filters].</string>
+  <string name="InventoryNoMatchingFavorites">You haven't marked any items as favorites.</string>
+  <string name="PlacesNoMatchingItems">To add a place to your landmarks, click the star to the right of the location name.</string>
 	<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>
-- 
cgit v1.2.3


From fc5e5327bca83846bb97cb7ff578b0dcb3a8892e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 2 May 2024 03:05:41 +0300
Subject: Viewer#1301 Implement Inventory Favorites Tab WIP#2

---
 .../default/textures/icons/Inv_Favorite_Star_Content.png  | Bin 0 -> 474 bytes
 .../default/textures/icons/Inv_Favorite_Star_Full.png     | Bin 0 -> 582 bytes
 indra/newview/skins/default/textures/textures.xml         |   2 ++
 .../skins/default/xui/en/floater_preview_trash.xml        |   4 ++--
 .../skins/default/xui/en/widgets/folder_view_item.xml     |   4 ++--
 .../default/xui/en/widgets/inbox_folder_view_folder.xml   |   4 ++--
 6 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Content.png
 create mode 100644 indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Full.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Content.png b/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Content.png
new file mode 100644
index 0000000000..bf7ec1599a
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Content.png differ
diff --git a/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Full.png b/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Full.png
new file mode 100644
index 0000000000..916b57f3c5
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Full.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index c733d3feaf..7f3b9a8cee 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -304,6 +304,8 @@ with the same filename but different name
   <texture name="Inv_CallingCard" file_name="icons/Inv_CallingCard.png" preload="false" />
   <texture name="Inv_Clothing" file_name="icons/Inv_Clothing.png" preload="false" />
   <texture name="Inv_Eye" file_name="icons/Inv_Eye.png" preload="false" />
+  <texture name="Inv_Favorite_Star_Content" file_name="icons/Inv_Favorite_Star_Content.png" preload="false" />
+  <texture name="Inv_Favorite_Star_Full" file_name="icons/Inv_Favorite_Star_Full.png" preload="false" />
   <texture name="Inv_FolderClosed" file_name="icons/Inv_FolderClosed.png" preload="false" />
   <texture name="Inv_FolderOpen" file_name="icons/Inv_FolderOpen.png" preload="false" />
   <texture name="Inv_Gesture" file_name="icons/Inv_Gesture.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_preview_trash.xml b/indra/newview/skins/default/xui/en/floater_preview_trash.xml
index f62e04baf2..ebb5cd9251 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_trash.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_trash.xml
@@ -29,8 +29,8 @@
       bevel_style="none"
       scroll.reserve_scroll_corner="false">
     <folder folder_arrow_image="Folder_Arrow"
-            favorite_image="Favorite_Star_Active"
-            favorite_content_image="Favorite_Star_Off"
+            favorite_image="Inv_Favorite_Star_Full"
+            favorite_content_image="Inv_Favorite_Star_Content"
             folder_indentation="8"
             item_height="20"
             item_top_pad="4"
diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
index 1bcd8886b4..50c5285e04 100644
--- a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <folder_view_item
   folder_arrow_image="Folder_Arrow"
-  favorite_image="Favorite_Star_Active"
-  favorite_content_image="Favorite_Star_Off"
+  favorite_image="Inv_Favorite_Star_Full"
+  favorite_content_image="Inv_Favorite_Star_Content"
   folder_indentation="8"
   item_height="20" 
   item_top_pad="4"
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
index 8f9017f9ce..865c145022 100644
--- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inbox_folder_view_folder
   folder_arrow_image="Folder_Arrow"
-  favorite_image="Favorite_Star_Active"
-  favorite_content_image="Favorite_Star_Off"
+  favorite_image="Inv_Favorite_Star_Full"
+  favorite_content_image="Inv_Favorite_Star_Content"
   folder_indentation="8"
   item_height="20" 
   item_top_pad="4"
-- 
cgit v1.2.3


From 1c170381aea21cfd75d7b8789374f04f3a46d408 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 4 May 2024 01:50:50 +0300
Subject: viewer#1300 Update Inventory Settings

---
 indra/newview/skins/default/colors.xml             |   3 +
 .../skins/default/textures/icons/Icon_Pointer.png  | Bin 0 -> 294 bytes
 indra/newview/skins/default/textures/textures.xml  |   1 +
 .../default/xui/en/floater_inventory_settings.xml  | 168 +++++++++++++++++----
 4 files changed, 143 insertions(+), 29 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Icon_Pointer.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 92f63a1820..60d9a5da23 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -453,6 +453,9 @@
     <color
      name="InventoryBackgroundColor"
      reference="DkGray2" />
+    <color
+     name="InventoryFavoriteColor"
+     reference="Yellow" />
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
diff --git a/indra/newview/skins/default/textures/icons/Icon_Pointer.png b/indra/newview/skins/default/textures/icons/Icon_Pointer.png
new file mode 100644
index 0000000000..021942a8aa
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Icon_Pointer.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 7f3b9a8cee..c9dcaebeeb 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -907,4 +907,5 @@ with the same filename but different name
   <texture name="Single_Folder_Up" file_name="icons/single_folder_up.png" preload="true"/>
   <texture name="Icon_Color_Palette" file_name="icons/Icon_Color_Palette.png" preload="false"/>
   <texture name="Icon_Font_Size" file_name="icons/Icon_Font_Size.png" preload="false"/>
+  <texture name="Icon_Pointer" file_name="icons/Icon_Pointer.png" preload="false"/>
 </textures>
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 156bba6c27..e027d7556f 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
@@ -4,8 +4,8 @@
  can_minimize="true"
  can_resize="false"
  save_rect="true"
- height="370"
- width="370"
+ height="460"
+ width="460"
  name="inventory_settings"
  title="INVENTORY SETTINGS">
  <icon
@@ -16,7 +16,7 @@
   left="18"
   mouse_opaque="true"
   name="multi_folder_icon"
-  top="25"
+  top="20"
   width="18" />
  <text
    type="string"
@@ -40,10 +40,10 @@
   font="SansSerifMedium"
   left="60"
   width="300"
-  height="70"
+  height="66"
   name="multi_double_click_setting">
      <radio_item
-      height="20"
+      height="18"
       label="Expands &amp; collapses folder"
       label_text.text_color="White"
       follows="left|top"
@@ -51,24 +51,24 @@
       name="0"
       width="200"/>
      <radio_item
-      height="20"
+      height="18"
       follows="left|top"
       label="Opens a new window"
       label_text.text_color="White"
       layout="topleft"
       left_delta="0"
       name="1"
-      top_pad ="5"
+      top_pad ="3"
       width="200" />
      <radio_item
-      height="20"
+      height="18"
       follows="left|top"
       label="Switches view"
       label_text.text_color="White"
       layout="topleft"
       left_delta="0"
       name="2"
-      top_pad ="5"
+      top_pad ="3"
       width="200" />
  </radio_group>
  <icon
@@ -79,7 +79,7 @@
   left="18"
   mouse_opaque="true"
   name="single_folder_icon"
-  top_pad="30"
+  top_pad="19"
   width="18" />
  <text
    type="string"
@@ -103,10 +103,10 @@
   font="SansSerifMedium"
   left="60"
   width="300"
-  height="45"
+  height="44"
   name="single_double_click_setting">
      <radio_item
-      height="20"
+      height="18"
       label="Stays in current window"
       label_text.text_color="White"
       follows="left|top"
@@ -114,27 +114,37 @@
       name="false"
       width="200"/>
      <radio_item
-      height="20"
+      height="18"
       follows="left|top"
       label="Opens a new window"
       label_text.text_color="White"
       layout="topleft"
       left_delta="0"
       name="true"
-      top_pad ="5"
+      top_pad ="3"
       width="200" />
  </radio_group>
+  <icon
+   follows="top|left"
+   height="15"
+   image_name="Icon_Pointer"
+   layout="topleft"
+   left="20"
+   mouse_opaque="true"
+   name="single_folder_icon"
+   top_pad="20"
+   width="15" />
  <text
    type="string"
    length="1"
    follows="left|top|right"
    height="13"
    layout="topleft"
-   left="48"
+   left_pad="13"
    name="find_original_txt"
    font="SansSerifMedium"
    text_color="White"
-   top_pad="30"
+   top_delta="1"
    width="300">
    Clicking on "Show in inventory" or "Find original"
  </text>
@@ -146,10 +156,10 @@
   font="SansSerifMedium"
   left="60"
   width="300"
-  height="45"
+  height="44"
   name="find_original_settings">
      <radio_item
-      height="20"
+      height="18"
       label="Shows item in main inventory window"
       label_text.text_color="White"
       follows="left|top"
@@ -157,23 +167,123 @@
       name="false"
       width="200"/>
      <radio_item
-      height="20"
+      height="18"
       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"
+      top_pad ="3"
       width="200" />
  </radio_group>
- <button
-  height="20"
-  label="OK"
-  layout="topleft"
-  left="140"
-  bottom="-20"
-  name="ok_btn"
-  label_color="White"
-  width="90" />
+  <icon
+   follows="top|left"
+   height="18"
+   image_name="Inv_Favorite_Star_Full"
+   layout="topleft"
+   left="18"
+   mouse_opaque="true"
+   name="favorites_icon"
+   top_pad="19"
+   width="18" />
+  <text
+   type="string"
+   length="1"
+   layout="topleft"
+   follows="left|top|right"
+   height="13"
+   left_pad="12"
+   top_delta="2"
+   name="favorites_txt"
+   font="SansSerifMedium"
+   text_color="White"
+   width="300">
+   Favorites
+  </text>
+  <check_box
+   control_name="InventoryFavoritesUseStar"
+   layout="topleft"
+   follows="left|top"
+   top_pad="8"
+   font="SansSerifMedium"
+   left="60"
+   width="300"
+   height="18"
+   label="Star"
+   name="favorite_star"
+   label_text.text_color="White"
+   initial_value="false"/>
+  <check_box
+   control_name="InventoryFavoritesColorText"
+   follows="left|top"
+   top_pad="5"
+   layout="topleft"
+   font="SansSerifMedium"
+   left="60"
+   width="150"
+   height="18"
+   label="Colored text"
+   name="favorites_color"
+   label_text.text_color="White"
+   initial_value="false"/>
+  <color_swatch
+   can_apply_immediately="true"
+   follows="left|top"
+   layout="topleft"
+   height="24"
+   label_height="0"
+   left_pad="40"
+   name="favorites_swatch"
+   top_delta="-6"
+   width="44" >
+    <color_swatch.init_callback
+     function="ScriptPref.getUIColor"
+     parameter="InventoryFavoriteColor" />
+    <color_swatch.commit_callback
+     function="ScriptPref.applyUIColor"
+     parameter="InventoryFavoriteColor" />
+  </color_swatch>
+  <icon
+   follows="top|left"
+   height="18"
+   image_name="Inv_Object"
+   layout="topleft"
+   left="18"
+   mouse_opaque="true"
+   name="obj_icon"
+   top_pad="19"
+   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">
+   Pressing return on an avatar attachment
+  </text>
+  <combo_box
+   control_name="InventoryAddAttachmentBehavior"
+   layout="topleft"
+   follows="left|top"
+   top_pad="8"
+   height="24"
+   left="60"
+   name="attach_combo"
+   width="300">
+    <combo_box.item
+      label="Adds attachment (recommended)"
+      name="0"
+      value="0"/>
+    <combo_box.item
+      label="Wear (removes attachment at that point)"
+      name="1"
+      value="1"/>
+  </combo_box>
 </floater>
-- 
cgit v1.2.3


From 5c78396b64c985a7e58d045ff3f343bccc81c8d3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 9 May 2024 00:40:30 +0300
Subject: viewer#1424 Favorites in Appearance floater #1

---
 .../textures/icons/Inv_Favorite_Star_Content.png   | Bin 474 -> 620 bytes
 .../textures/icons/Inv_Favorite_Star_Full.png      | Bin 582 -> 485 bytes
 .../default/xui/en/menu_gallery_inventory.xml      |  16 +++++++++++
 .../default/xui/en/menu_gallery_outfit_tab.xml     |  20 ++++++++++++++
 .../skins/default/xui/en/menu_outfit_gear.xml      |  30 +++++++++++++++++----
 .../skins/default/xui/en/menu_outfit_tab.xml       |  14 ++++++++++
 6 files changed, 75 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Content.png b/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Content.png
index bf7ec1599a..b71b202234 100644
Binary files a/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Content.png and b/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Content.png differ
diff --git a/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Full.png b/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Full.png
index 916b57f3c5..7d55fb5cfe 100644
Binary files a/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Full.png and b/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Full.png differ
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 929c626947..11c9988dd6 100644
--- a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -125,6 +125,22 @@
          function="Inventory.DoToSelected"
          parameter="thumbnail" />
     </menu_item_call>
+    <menu_item_call
+     label="Add to favorites"
+     layout="topleft"
+     name="favorites_add">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="favorite" />
+    </menu_item_call>
+  <menu_item_call
+   label="Remove from favorites"
+   layout="topleft"
+   name="favorites_remove">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="favorite" />
+  </menu_item_call>
     <menu_item_call
      label="Copy Asset UUID"
      layout="topleft"
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 99cee83f4e..77de521154 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
@@ -49,6 +49,26 @@
         <on_click
         function="Outfit.Thumbnail" />
     </menu_item_call>
+    <menu_item_call
+        label="Add to favorites"
+        layout="topleft"
+        name="favorites_add">
+      <on_visible
+      function="Outfit.OnVisible"
+      parameter="favorites_add" />
+        <on_click
+        function="Outfit.Favorite" />
+    </menu_item_call>
+  <menu_item_call
+      label="Remove from favorites"
+      layout="topleft"
+      name="favorites_remove">
+    <on_visible
+    function="Outfit.OnVisible"
+    parameter="favorites_remove" />
+    <on_click
+     function="Outfit.Favorite" />
+  </menu_item_call>
     <menu_item_call
         label="Edit outfit"
         layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index 8f36c7a00a..794041c083 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -49,6 +49,26 @@
        <on_click
         function="Gear.Thumbnail" />
     </menu_item_call>
+    <menu_item_call
+     label="Add to favorite outfits"
+     layout="topleft"
+     name="favorites_add">
+        <on_visible
+         function="Gear.OnVisible"
+         parameter="favorites_add" />
+       <on_click
+        function="Gear.Favorite" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove from favorite outfits"
+     layout="topleft"
+     name="favorites_remove">
+        <on_visible
+         function="Gear.OnVisible"
+         parameter="favorites_remove" />
+       <on_click
+        function="Gear.Favorite" />
+    </menu_item_call>
     <menu_item_call
      label="Rename outfit"
      layout="topleft"
@@ -94,14 +114,14 @@
          function="Gear.OnVisible"/>
     </menu_item_separator>
     <menu_item_check
-     label="Sort folders always by name"
+     label="Show outfits with images first"
      layout="topleft"
-     name="sort_folders_by_name">
+     name="sort_order_by_image">
         <on_click
-         function="Gear.SortByName" />
+         function="Gear.SortByImage" />
         <on_check
-         function="CheckControl"
-         parameter="OutfitGallerySortByName" />
+         function="Gear.OnEnable"
+         parameter="sort_by_image" />
     </menu_item_check>
         <menu_item_call
      label="Expand all folders"
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
index c6805edd63..070efe9d78 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
@@ -49,6 +49,20 @@
         <on_click
         function="Outfit.Thumbnail" />
     </menu_item_call>
+    <menu_item_call
+     label="Add to favorites"
+     layout="topleft"
+     name="favorites_add">
+       <on_click
+        function="Outfit.Favorite" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove from favorites"
+     layout="topleft"
+     name="favorites_remove">
+       <on_click
+        function="Outfit.Favorite" />
+    </menu_item_call>
     <menu_item_call
         label="Edit outfit"
         layout="topleft"
-- 
cgit v1.2.3


From a420e84f4822d19388241f99a916dacc4d1eab61 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 9 May 2024 23:22:26 +0300
Subject: viewer#1424 Favorites in Appearance floater #2

---
 .../default/xui/en/menu_gallery_outfit_tab.xml     | 32 +++++++++++-----------
 .../skins/default/xui/en/menu_outfit_gear.xml      | 12 ++++----
 .../skins/default/xui/en/menu_outfit_tab.xml       |  6 ++++
 3 files changed, 28 insertions(+), 22 deletions(-)

(limited to 'indra/newview/skins')

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 77de521154..fb68193006 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
@@ -50,24 +50,24 @@
         function="Outfit.Thumbnail" />
     </menu_item_call>
     <menu_item_call
-        label="Add to favorites"
-        layout="topleft"
-        name="favorites_add">
+     label="Add to favorites"
+     layout="topleft"
+     name="favorites_add">
       <on_visible
-      function="Outfit.OnVisible"
-      parameter="favorites_add" />
-        <on_click
-        function="Outfit.Favorite" />
+       function="Outfit.OnVisible"
+       parameter="favorites_add" />
+      <on_click
+       function="Outfit.Favorite" />
     </menu_item_call>
-  <menu_item_call
-      label="Remove from favorites"
-      layout="topleft"
-      name="favorites_remove">
-    <on_visible
-    function="Outfit.OnVisible"
-    parameter="favorites_remove" />
-    <on_click
-     function="Outfit.Favorite" />
+    <menu_item_call
+     label="Remove from favorites"
+     layout="topleft"
+     name="favorites_remove">
+      <on_visible
+       function="Outfit.OnVisible"
+       parameter="favorites_remove" />
+      <on_click
+       function="Outfit.Favorite" />
   </menu_item_call>
     <menu_item_call
         label="Edit outfit"
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 794041c083..7eb03ce6d8 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -53,9 +53,9 @@
      label="Add to favorite outfits"
      layout="topleft"
      name="favorites_add">
-        <on_visible
-         function="Gear.OnVisible"
-         parameter="favorites_add" />
+       <on_visible
+        function="Gear.OnVisible"
+        parameter="favorites_add" />
        <on_click
         function="Gear.Favorite" />
     </menu_item_call>
@@ -63,9 +63,9 @@
      label="Remove from favorite outfits"
      layout="topleft"
      name="favorites_remove">
-        <on_visible
-         function="Gear.OnVisible"
-         parameter="favorites_remove" />
+       <on_visible
+        function="Gear.OnVisible"
+        parameter="favorites_remove" />
        <on_click
         function="Gear.Favorite" />
     </menu_item_call>
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
index 070efe9d78..0d45e7c95c 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
@@ -53,6 +53,9 @@
      label="Add to favorites"
      layout="topleft"
      name="favorites_add">
+       <on_visible
+        function="Outfit.OnVisible"
+        parameter="favorites_add" />
        <on_click
         function="Outfit.Favorite" />
     </menu_item_call>
@@ -60,6 +63,9 @@
      label="Remove from favorites"
      layout="topleft"
      name="favorites_remove">
+       <on_visible
+        function="Outfit.OnVisible"
+        parameter="favorites_remove" />
        <on_click
         function="Outfit.Favorite" />
     </menu_item_call>
-- 
cgit v1.2.3


From b9633c17e373bfe55b29228996e8473eb041466d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 11 May 2024 02:07:20 +0300
Subject: viewer#1424 Favorites in Appearance floater #3

Menus
---
 .../skins/default/xui/en/menu_outfit_gear.xml      |  35 ++++---
 .../skins/default/xui/en/menu_outfit_sort.xml      |  51 ++++++++++
 .../skins/default/xui/en/panel_outfit_gallery.xml  |  48 +--------
 .../skins/default/xui/en/panel_outfits_list.xml    |  46 +--------
 .../skins/default/xui/en/panel_outfits_wearing.xml |  33 +-----
 .../skins/default/xui/en/sidepanel_appearance.xml  | 111 ++++++++++++++++++---
 6 files changed, 169 insertions(+), 155 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_outfit_sort.xml

(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 7eb03ce6d8..bd0c49309d 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -109,10 +109,8 @@
          function="Gear.OnVisible"
          parameter="delete" />
     </menu_item_call>
-    <menu_item_separator>
-        <on_visible
-         function="Gear.OnVisible"/>
-    </menu_item_separator>
+    <menu_item_separator
+      name="sort_order_separator"/>
     <menu_item_check
      label="Show outfits with images first"
      layout="topleft"
@@ -123,20 +121,6 @@
          function="Gear.OnEnable"
          parameter="sort_by_image" />
     </menu_item_check>
-        <menu_item_call
-     label="Expand all folders"
-     layout="topleft"
-     name="expand">
-        <on_click
-         function="Gear.Expand" />
-    </menu_item_call>
-    <menu_item_call
-     label="Collapse all folders"
-     layout="topleft"
-     name="collapse">
-        <on_click
-         function="Gear.Collapse" />
-    </menu_item_call>
   <menu_item_separator/>
             <!-- copied (with minor modifications) from menu_inventory_add.xml -->
             <!--  *TODO: generate dynamically? -->
@@ -297,4 +281,19 @@
                 </menu_item_call>
             </menu>
             <!-- copied from menu_inventory_add.xml -->
+
+  <menu_item_separator
+    name="inv_settings_separator"/>
+
+  <menu_item_check
+   label="Inventory settings..."
+   layout="topleft"
+   name="inventory_settings">
+    <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>
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_sort.xml b/indra/newview/skins/default/xui/en/menu_outfit_sort.xml
new file mode 100644
index 0000000000..eeee5689a7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_outfit_sort.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu
+ layout="topleft"
+ visible="false"
+ name="Sort Outfit">
+    <menu_item_call
+     label="Expand all folders"
+     layout="topleft"
+     name="expand">
+        <on_click
+         function="Sort.OnAction"
+         parameter="expand" />
+    </menu_item_call>
+    <menu_item_call
+     label="Collapse all folders"
+     layout="topleft"
+     visible="true"
+     name="collapse">
+        <on_click
+         function="Sort.OnAction"
+         parameter="collapse" />
+    </menu_item_call>
+  
+  <menu_item_separator/>
+
+  <menu_item_check
+   label="Sort favorites to top"
+   layout="topleft"
+   name="sort_favorites_to_top">
+    <on_click
+     function="Sort.OnAction"
+    parameter="sort_favorites" />
+    <on_check
+     function="Sort.OnEnable"
+     parameter="sort_favorites" />
+  </menu_item_check>
+
+  <menu_item_separator/>
+
+  <menu_item_check
+   label="Show entire outfit in search"
+   layout="topleft"
+   name="show_entire_outfit_in_search">
+    <on_click
+     function="Sort.OnAction"
+    parameter="show_entire_outfit" />
+    <on_check
+     function="Sort.OnEnable"
+     parameter="show_entire_outfit" />
+  </menu_item_check>
+</toggleable_menu>
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 6bd491f7a3..96624e7aa2 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
@@ -35,7 +35,7 @@
   </text> 
   <scroll_container
    follows="all"
-   height="400"
+   height="429"
    width="312"
    layout="topleft"
    left="4"
@@ -44,49 +44,5 @@
    name="gallery_scroll_panel"
    opaque="false"
    top_pad="0">
-  </scroll_container> 
-  <panel
-     background_visible="true"
-	 follows="bottom|left|right"
-	 height="28"
-	 layout="topleft"
-	 left="4"
-	 top_pad="0"
-	 visible="true"
-	 name="bottom_panel"
-	 width="312">
-     <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="1"
-       width="31" />
-     <icon
-       follows="bottom|left|right"
-       height="25"
-       image_name="Toolbar_Middle_Off"
-       layout="topleft"
-       left_pad="1"
-       name="dummy_icon"
-       width="243"/>
-      <button
-       follows="bottom|right"
-       height="25"
-       image_hover_unselected="Toolbar_Right_Over"
-       image_overlay="TrashItem_Off"
-       image_selected="Toolbar_Right_Selected"
-       image_unselected="Toolbar_Right_Off"
-       layout="topleft"
-       left_pad="1"
-       name="trash_btn"
-       tool_tip="Delete selected outfit"
-       width="31"/>
-    </panel>
+  </scroll_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
index 9281a21fbf..b38e2b2b50 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
@@ -16,7 +16,7 @@
      bg_opaque_color="DkGray2"
 
      follows="all"
-     height="400"
+     height="428"
      layout="topleft"
      left="3"
      name="outfits_accordion"
@@ -30,48 +30,4 @@
          name="no_outfits_msg"
          value="You don't have any outfits yet. Try [secondlife:///app/search/all/ Search]"/>
     </accordion>
-    <panel
-     background_visible="true"
-	 follows="bottom|left|right"
-	 height="28"
-	 layout="topleft"
-	 left="4"
-	 top_pad="0"
-	 visible="true"
-	 name="bottom_panel"
-	 width="312">
-     <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="1"
-       width="31" />
-     <icon
-       follows="bottom|left|right"
-       height="25"
-       image_name="Toolbar_Middle_Off"
-       layout="topleft"
-       left_pad="1"
-       name="dummy_icon"
-       width="243"/>
-      <button
-       follows="bottom|right"
-       height="25"
-       image_hover_unselected="Toolbar_Right_Over"
-       image_overlay="TrashItem_Off"
-       image_selected="Toolbar_Right_Selected"
-       image_unselected="Toolbar_Right_Off"
-       layout="topleft"
-       left_pad="1"
-       name="trash_btn"
-       tool_tip="Delete selected outfit"
-       width="31"/>
-    </panel>
 </panel>
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 a486c03ac7..ceefe9f6fb 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
@@ -16,7 +16,7 @@
      <accordion
      fit_parent="true"
      follows="all"
-     height="400"
+     height="429"
      layout="topleft"
      left="3"
      single_expansion="true"
@@ -62,35 +62,4 @@
   </scroll_list>
      </accordion_tab>
      </accordion>
-    <panel
-     background_visible="true"
-     follows="bottom|left|right"
-     height="28"
-     layout="topleft"
-     left="4"
-     name="bottom_panel"
-     top_pad="0"
-     width="312">
-        <menu_button
-         follows="bottom|left"
-         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"
-         tool_tip="Show additional options"
-         top="1"
-         width="31" />
-        <icon
-         follows="bottom|left|right"
-         height="25"
-         image_name="Toolbar_Right_Off"
-         layout="topleft"
-         left_pad="1"
-         name="dummy_icon"
-         width="274" />
-    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index c898b0989e..a16b0b58da 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -64,7 +64,7 @@ width="333">
       font="SansSerifSmall"
       text_color="EmphasisColor"
       width="300"
-      height="10"
+      height="13"
       follows="top|left|right"
       layout="topleft"
       left="35"
@@ -94,7 +94,7 @@ width="333">
       image_overlay="Edit_Wrench"
       label=""
       layout="topleft"
-      left="265"
+      right="-3"
       name="edit_outfit_btn"
       tool_tip="Edit this outfit"
       top="3"
@@ -108,17 +108,100 @@ width="333">
       top="6"
       width="24" />
    </panel>
-   <filter_editor
-   height="23"
-   follows="left|top|right"
-   layout="topleft"
-   left="10"
-   label="Filter Outfits"
-   max_length_chars="300"
-   name="Filter"
-   search_button_visible="true"
-   top_pad="10"
-   width="307" />
+   <layout_stack
+    animate="false"
+    border_size="0"
+    follows="left|top|right"
+    height="27"
+    layout="topleft"
+    orientation="horizontal"
+    top_pad="6"
+    left="0"
+    name="top_menu_panel"
+    width="320">
+    <layout_panel
+      auto_resize="true"
+      layout="topleft"
+      name="filter_panel"
+      width="193">
+      <filter_editor
+        text_pad_left="10"
+        follows="left|top|right"
+        font="SansSerifSmall"
+        height="23"
+        layout="topleft"
+        left="10"
+        label="Filter Outfits"
+        max_length_chars="300"
+        name="Filter"
+        search_button_visible="true"
+        tab_group="1"
+        top="3"
+        width="181" />
+    </layout_panel>
+    <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_Middle_Over"
+        image_overlay="OptionsMenu_Off"
+        image_selected="Toolbar_Middle_Selected"
+        image_unselected="Toolbar_Middle_Off"
+        menu_position="bottomleft"
+        layout="topleft"
+        left="0"
+        name="options_gear_btn"
+        top="0"
+        width="31" />
+    </layout_panel>
+    <layout_panel
+      auto_resize="false"
+      height="25"
+      layout="topleft"
+      name="options_sort_btn_panel"
+      width="32">
+      <menu_button
+        follows="bottom|left"
+        tool_tip="Show sorting options"
+        height="25"
+        image_hover_unselected="Toolbar_Middle_Over"
+        image_overlay="Conv_toolbar_sort"
+        image_selected="Toolbar_Middle_Selected"
+        image_unselected="Toolbar_Middle_Off"
+        menu_position="bottomleft"
+        layout="topleft"
+        left="0"
+        name="sorting_menu_btn"
+        top="0"
+        width="31" />
+    </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="Delete selected outfit"
+        top="0"
+        width="31"/>
+    </layout_panel>
+  </layout_stack>
    <panel
    class="panel_outfits_inventory"
    filename="panel_outfits_inventory.xml"
@@ -129,7 +212,7 @@ width="333">
    visible="false"
    left="0"
    tab_group="1"
-   top_pad="6"
+   top_pad="4"
    follows="all" />
    <panel
    class="panel_outfit_edit"
-- 
cgit v1.2.3


From 7d1597fc98868c73d6de0b95f3c1af4c459a30c8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 13 May 2024 22:16:20 +0300
Subject: viewer#1424 Favorites in Appearance floater #4

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_outfit_sort.xml b/indra/newview/skins/default/xui/en/menu_outfit_sort.xml
index eeee5689a7..98d6301fbb 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_sort.xml
@@ -8,8 +8,7 @@
      layout="topleft"
      name="expand">
         <on_click
-         function="Sort.OnAction"
-         parameter="expand" />
+         function="Sort.Expand" />
     </menu_item_call>
     <menu_item_call
      label="Collapse all folders"
@@ -17,8 +16,7 @@
      visible="true"
      name="collapse">
         <on_click
-         function="Sort.OnAction"
-         parameter="collapse" />
+         function="Sort.Collapse" />
     </menu_item_call>
   
   <menu_item_separator/>
@@ -28,7 +26,7 @@
    layout="topleft"
    name="sort_favorites_to_top">
     <on_click
-     function="Sort.OnAction"
+     function="Sort.OnSort"
     parameter="sort_favorites" />
     <on_check
      function="Sort.OnEnable"
@@ -42,7 +40,7 @@
    layout="topleft"
    name="show_entire_outfit_in_search">
     <on_click
-     function="Sort.OnAction"
+     function="Sort.OnSort"
     parameter="show_entire_outfit" />
     <on_check
      function="Sort.OnEnable"
-- 
cgit v1.2.3


From 1eeecfa1a8bf43a8980217ce34e3b5f4458483e0 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 14 May 2024 15:11:45 +0300
Subject: viewer#1425 Sorting in Appearance floater

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_outfit_sort.xml b/indra/newview/skins/default/xui/en/menu_outfit_sort.xml
index 98d6301fbb..0a4d1ea877 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_sort.xml
@@ -27,10 +27,10 @@
    name="sort_favorites_to_top">
     <on_click
      function="Sort.OnSort"
-    parameter="sort_favorites" />
+    parameter="favorites_to_top" />
     <on_check
      function="Sort.OnEnable"
-     parameter="sort_favorites" />
+     parameter="favorites_to_top" />
   </menu_item_check>
 
   <menu_item_separator/>
-- 
cgit v1.2.3


From 50b93bd83af7cc4ddbd5b8b68f20099dac5f5ed2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 14 May 2024 17:28:00 +0300
Subject: viewer#1424 Favorite support in galleries

---
 .../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 73cb9b080f..f5906c17fd 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
@@ -43,6 +43,16 @@
     follows="left|top"
     visible="false"
     image_name="Inv_Link"/>
+  <icon
+   layout="topleft"
+   follows="left|top"
+   name="fav_icon"
+   left="110"
+   top_pad="-14"
+   height="14"
+   width="14"
+   visible="true"
+   image_name="Inv_Favorite_Star_Full"/>
   <panel
    background_visible="false"
    background_opaque="true"
-- 
cgit v1.2.3


From 738cf84c340d8ade3ab462340d1444c4e70ef9f5 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 9 May 2024 23:51:11 +0300
Subject: viewer#1424 Favorite support for items in outfits

For now marking originals, pointless to marks links in COF, needs a
revision due to inconsistency with inventory
---
 .../skins/default/xui/en/menu_wearable_list_item.xml       | 14 ++++++++++++++
 indra/newview/skins/default/xui/en/menu_wearing_tab.xml    | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
index ee77ef23f0..63d37edf38 100644
--- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
@@ -79,6 +79,20 @@
         <on_click
          function="Attachment.Profile" />
     </menu_item_call>
+    <menu_item_call
+     label="Add to favorites"
+     layout="topleft"
+     name="favorites_add">
+       <on_click
+        function="Attachment.Favorite" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove from favorites"
+     layout="topleft"
+     name="favorites_remove">
+       <on_click
+        function="Attachment.Favorite" />
+    </menu_item_call>
     <menu_item_call
      label="Show Original"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
index 321e8a0831..9a752a1643 100644
--- a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
@@ -31,6 +31,20 @@
          function="Wearing.Detach"
          parameter="detach"/>
     </menu_item_call>
+    <menu_item_call
+     label="Add to favorites"
+     layout="topleft"
+     name="favorites_add">
+       <on_click
+        function="Wearing.Favorite" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove from favorites"
+     layout="topleft"
+     name="favorites_remove">
+       <on_click
+        function="Wearing.Favorite" />
+    </menu_item_call>
     <menu_item_separator
      layout="topleft"
      name="edit_outfit_separator" />
-- 
cgit v1.2.3


From 98f7d73d46fdc045759023eda6409e8c791f5cb2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 16 May 2024 17:08:26 +0300
Subject: viewer#1424 Finish menus

---
 .../default/xui/en/menu_outfit_gallery_sort.xml    | 42 +++++++++++++++++++
 .../skins/default/xui/en/menu_outfit_gear.xml      | 16 +------
 .../skins/default/xui/en/menu_outfit_list_sort.xml | 49 ++++++++++++++++++++++
 .../skins/default/xui/en/menu_outfit_sort.xml      | 49 ----------------------
 4 files changed, 93 insertions(+), 63 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_outfit_gallery_sort.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_outfit_list_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/en/menu_outfit_sort.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gallery_sort.xml b/indra/newview/skins/default/xui/en/menu_outfit_gallery_sort.xml
new file mode 100644
index 0000000000..aa4cd1483d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gallery_sort.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu
+ layout="topleft"
+ visible="false"
+ name="Sort Outfit">  
+  <menu_item_check
+   label="Sort favorites to top"
+   layout="topleft"
+   visible="true"
+   name="sort_favorites_to_top">
+    <on_click
+     function="Sort.OnSort"
+    parameter="favorites_to_top" />
+    <on_check
+     function="Sort.OnEnable"
+     parameter="favorites_to_top" />
+  </menu_item_check>
+  <menu_item_check
+   label="Sort images to top"
+   layout="topleft"
+   visible="true"
+   name="sort_images_to_top">
+    <on_click
+     function="Sort.OnSort"
+    parameter="images_to_top" />
+    <on_check
+     function="Sort.OnEnable"
+     parameter="images_to_top" />
+  </menu_item_check>
+  <menu_item_check
+   label="Sort by name"
+   layout="topleft"
+   visible="true"
+   name="sort_by_name">
+    <on_click
+     function="Sort.OnSort"
+    parameter="by_name" />
+    <on_check
+     function="Sort.OnEnable"
+     parameter="by_name" />
+  </menu_item_check>
+</toggleable_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 bd0c49309d..e333b05d3e 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -109,18 +109,6 @@
          function="Gear.OnVisible"
          parameter="delete" />
     </menu_item_call>
-    <menu_item_separator
-      name="sort_order_separator"/>
-    <menu_item_check
-     label="Show outfits with images first"
-     layout="topleft"
-     name="sort_order_by_image">
-        <on_click
-         function="Gear.SortByImage" />
-        <on_check
-         function="Gear.OnEnable"
-         parameter="sort_by_image" />
-    </menu_item_check>
   <menu_item_separator/>
             <!-- copied (with minor modifications) from menu_inventory_add.xml -->
             <!--  *TODO: generate dynamically? -->
@@ -282,12 +270,12 @@
             </menu>
             <!-- copied from menu_inventory_add.xml -->
 
-  <menu_item_separator
-    name="inv_settings_separator"/>
+  <menu_item_separator/>
 
   <menu_item_check
    label="Inventory settings..."
    layout="topleft"
+   visible="true"
    name="inventory_settings">
     <menu_item_check.on_check
      function="Floater.Visible"
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_list_sort.xml b/indra/newview/skins/default/xui/en/menu_outfit_list_sort.xml
new file mode 100644
index 0000000000..0a4d1ea877
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_outfit_list_sort.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu
+ layout="topleft"
+ visible="false"
+ name="Sort Outfit">
+    <menu_item_call
+     label="Expand all folders"
+     layout="topleft"
+     name="expand">
+        <on_click
+         function="Sort.Expand" />
+    </menu_item_call>
+    <menu_item_call
+     label="Collapse all folders"
+     layout="topleft"
+     visible="true"
+     name="collapse">
+        <on_click
+         function="Sort.Collapse" />
+    </menu_item_call>
+  
+  <menu_item_separator/>
+
+  <menu_item_check
+   label="Sort favorites to top"
+   layout="topleft"
+   name="sort_favorites_to_top">
+    <on_click
+     function="Sort.OnSort"
+    parameter="favorites_to_top" />
+    <on_check
+     function="Sort.OnEnable"
+     parameter="favorites_to_top" />
+  </menu_item_check>
+
+  <menu_item_separator/>
+
+  <menu_item_check
+   label="Show entire outfit in search"
+   layout="topleft"
+   name="show_entire_outfit_in_search">
+    <on_click
+     function="Sort.OnSort"
+    parameter="show_entire_outfit" />
+    <on_check
+     function="Sort.OnEnable"
+     parameter="show_entire_outfit" />
+  </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_sort.xml b/indra/newview/skins/default/xui/en/menu_outfit_sort.xml
deleted file mode 100644
index 0a4d1ea877..0000000000
--- a/indra/newview/skins/default/xui/en/menu_outfit_sort.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu
- layout="topleft"
- visible="false"
- name="Sort Outfit">
-    <menu_item_call
-     label="Expand all folders"
-     layout="topleft"
-     name="expand">
-        <on_click
-         function="Sort.Expand" />
-    </menu_item_call>
-    <menu_item_call
-     label="Collapse all folders"
-     layout="topleft"
-     visible="true"
-     name="collapse">
-        <on_click
-         function="Sort.Collapse" />
-    </menu_item_call>
-  
-  <menu_item_separator/>
-
-  <menu_item_check
-   label="Sort favorites to top"
-   layout="topleft"
-   name="sort_favorites_to_top">
-    <on_click
-     function="Sort.OnSort"
-    parameter="favorites_to_top" />
-    <on_check
-     function="Sort.OnEnable"
-     parameter="favorites_to_top" />
-  </menu_item_check>
-
-  <menu_item_separator/>
-
-  <menu_item_check
-   label="Show entire outfit in search"
-   layout="topleft"
-   name="show_entire_outfit_in_search">
-    <on_click
-     function="Sort.OnSort"
-    parameter="show_entire_outfit" />
-    <on_check
-     function="Sort.OnEnable"
-     parameter="show_entire_outfit" />
-  </menu_item_check>
-</toggleable_menu>
-- 
cgit v1.2.3


From 4c676acedd3c99234e599b77bcfdec6ad3274efb Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 17 May 2024 20:47:19 +0300
Subject: viewer#1300 More favorite settings

---
 .../default/xui/en/floater_inventory_settings.xml     | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 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 e027d7556f..08b7a7af05 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
@@ -4,8 +4,8 @@
  can_minimize="true"
  can_resize="false"
  save_rect="true"
- height="460"
- width="460"
+ height="483"
+ width="483"
  name="inventory_settings"
  title="INVENTORY SETTINGS">
  <icon
@@ -210,10 +210,23 @@
    left="60"
    width="300"
    height="18"
-   label="Star"
+   label="Star on favorite items"
    name="favorite_star"
    label_text.text_color="White"
    initial_value="false"/>
+  <check_box
+   control_name="InventoryFavoritesUseHollowStar"
+   follows="left|top"
+   top_pad="5"
+   layout="topleft"
+   font="SansSerifMedium"
+   left="60"
+   width="150"
+   height="18"
+   label="Star on folders containing a favorite"
+   name="favorite_hollow_star"
+   label_text.text_color="White"
+   initial_value="false"/>
   <check_box
    control_name="InventoryFavoritesColorText"
    follows="left|top"
-- 
cgit v1.2.3


From 6ee6d19f600bb7fee99f96e8476e2c57088dad17 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 26 Jun 2024 14:48:02 +0300
Subject: viewer#1005 Review fixes

---
 .../skins/default/xui/en/menu_gallery_inventory.xml      | 16 ----------------
 1 file changed, 16 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 11c9988dd6..929c626947 100644
--- a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -125,22 +125,6 @@
          function="Inventory.DoToSelected"
          parameter="thumbnail" />
     </menu_item_call>
-    <menu_item_call
-     label="Add to favorites"
-     layout="topleft"
-     name="favorites_add">
-        <menu_item_call.on_click
-         function="Inventory.DoToSelected"
-         parameter="favorite" />
-    </menu_item_call>
-  <menu_item_call
-   label="Remove from favorites"
-   layout="topleft"
-   name="favorites_remove">
-    <menu_item_call.on_click
-     function="Inventory.DoToSelected"
-     parameter="favorite" />
-  </menu_item_call>
     <menu_item_call
      label="Copy Asset UUID"
      layout="topleft"
-- 
cgit v1.2.3