From 8094d13c2e23ae8f18826c59cc96f6fb89fb1dc0 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Tue, 9 Jul 2019 23:52:38 -0400
Subject: [PATCH] Use type names instead of new category names for built in
 folder floaters

---
 indra/newview/skins/default/xui/en-us/menu_viewer.xml   | 8 ++++----
 indra/newview/skins/default/xui/en-us/panel_toolbar.xml | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 138d195f3..4f052505d 100644
--- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -618,12 +618,12 @@
 		<menu_item_separator bottom="-213" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator5" width="185" />
         <menu_item_call bottom="-29" height="19" label="My Outfits" left="0" name="My Outfits" width="166">
-            <on_click function="ShowInvFloater.Name" userdata="My Outfits"/>
-            <on_check function="InvFloaterVisible.Name" userdata="My Outfits"/>
+            <on_click function="ShowInvFloater.Type" userdata="my_otfts"/>
+            <on_check function="InvFloaterVisible.Type" userdata="my_otfts"/>
         </menu_item_call>
         <menu_item_call bottom="-29" height="19" label="Favorites" left="0" name="Favorites" width="166">
-            <on_click function="ShowInvFloater.Name" userdata="Favorites"/>
-            <on_check function="InvFloaterVisible.Name" userdata="Favorites"/>
+            <on_click function="ShowInvFloater.Type" userdata="favorite"/>
+            <on_check function="InvFloaterVisible.Type" userdata="favorite"/>
         </menu_item_call>
         <menu_item_check label="Default Avatars" name="Avatar Picker">
             <on_click function="ShowFloater" userdata="avatar"/>
diff --git a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
index ae4d6a953..d025f6eb5 100644
--- a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
@@ -399,12 +399,13 @@
     </layout_panel>
     <layout_panel name="paneloutfits" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleInventoryOutfits">
       <button sound_flags="0" bottom="0" height="24" label="Outfits" image_overlay="icn_toolbar_outfits.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="outfits_btn" width="50" follows="left|right">
-        <button.commit_callback function="ShowInvFloater.Name" parameter="My Outfits"/>
+        <button.commit_callback function="ShowInvFloater.Type" parameter="my_otfts"/>
       </button>
     </layout_panel>
     <layout_panel name="panelfavs" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleInventoryFavs">
       <button sound_flags="0" bottom="0" height="24" label="Favorites" image_overlay="icn_toolbar_favorites.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="favs_btn" width="50" follows="left|right">
-        <button.commit_callback function="ShowInvFloater.Name" parameter="Favorites"/>
+        <button.commit_callback function="ShowInvFloater.Type" parameter="favorite"/>
+      </button>
       </button>
     </layout_panel>
     <layout_panel name="panelmarketplacelistings" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleMarketplaceListings">