Merge commit '738cf84c34' into marchcat/c-develop

# Conflicts:
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llfolderviewitem.h
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llconversationmodel.h
#	indra/newview/llfloaterinventorysettings.cpp
#	indra/newview/llfolderviewmodelinventory.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorygallery.h
#	indra/newview/llinventorygallerymenu.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitgallery.h
#	indra/newview/lloutfitslist.cpp
#	indra/newview/lloutfitslist.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpaneloutfitsinventory.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llsidepanelappearance.cpp
#	indra/newview/llwearableitemslist.cpp

19 files changed, 480 insertions, 189 deletions

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>
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..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,6 +29,8 @@
       bevel_style="none"
       scroll.reserve_scroll_corner="false">
     <folder folder_arrow_image="Folder_Arrow"
+            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/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
index 16907d3577..d9919661f3 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">
@@ -670,6 +686,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_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
index 99cee83f4e..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,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_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index d8aac71dd5..ed2b8ea7bd 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -951,6 +951,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_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index 8f36c7a00a..bd0c49309d 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">
@@ -89,34 +109,18 @@
          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="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"
-     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? -->
@@ -277,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..0a4d1ea877
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_outfit_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_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
index c6805edd63..0d45e7c95c 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,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_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
@@ -80,6 +80,20 @@
          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"
      visible="false"
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" />
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"
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 498dab1ef3..6e1e6facbe 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -269,6 +269,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/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"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3ec4b7205b..a0ee52cfd0 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2324,6 +2324,7 @@ 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="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>
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..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,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <folder_view_item
   folder_arrow_image="Folder_Arrow"
+  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 27ec6ded81..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,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inbox_folder_view_folder
   folder_arrow_image="Folder_Arrow"
+  favorite_image="Inv_Favorite_Star_Full"
+  favorite_content_image="Inv_Favorite_Star_Content"
   folder_indentation="8"
   item_height="20" 
   item_top_pad="4"