viewer#1424 Favorites in Appearance floater #1

6 files changed, 75 insertions, 5 deletions

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
--- a/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Content.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Content.png
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
--- a/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Full.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Full.png
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
@@ -126,6 +126,22 @@
          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"
      name="Copy Asset UUID">
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
@@ -50,6 +50,26 @@
         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"
         name="edit">
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
@@ -50,6 +50,26 @@
         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"
      name="rename">
@@ -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
@@ -50,6 +50,20 @@
         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"
         name="edit">