diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
3 files changed, 46 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 8ab5fb1659..2b101e9058 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1709,6 +1709,8 @@ layout="topleft" name="Fly" shortcut="Home"> + <menu_item_check.on_check + function="Agent.getFlying" /> <menu_item_check.on_click function="Agent.toggleFlying" /> <menu_item_check.on_enable diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 0d1ed6fc64..cdf62340b2 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3932,6 +3932,18 @@ Would you like to leave Busy Mode before completing this transaction? <notification icon="alertmodal.tga" + name="ConfirmDeleteProtectedCategory" + type="alertmodal"> +The folder '[FOLDERNAME]' is a system folder. Deleting system folders can cause instability. Are you sure you want to delete it? + <usetemplate + ignoretext="Confirm before I delete a system folder" + name="okcancelignore" + notext="Cancel" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="ConfirmEmptyTrash" type="alertmodal"> Are you sure you want to permanently delete the contents of your Trash? diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index f511ec0d6f..d805209bf5 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -6,6 +6,18 @@ width="310" border="true" follows="left|top|right|bottom"> + <accordion + follows="left|top|right|bottom" + height="315" + layout="topleft" + left="0" + name="outfits_accordion" + top="2" + width="310"> + <accordion_tab + layout="topleft" + name="tab_outfits" + title="Outfits bar"> <inventory_panel allow_multi_select="true" border="true" @@ -14,9 +26,28 @@ height="326" left="0" mouse_opaque="true" - name="outfits_list" + name="outfitslist_accordionpanel" width="310" start_folder="My Outfits"/> + </accordion_tab> + <accordion_tab + layout="topleft" + name="tab_cof" + title="Current Outfit bar"> + <inventory_panel + allow_multi_select="true" + border="true" + bottom="0" + follows="left|top|right|bottom" + height="326" + left="0" + mouse_opaque="true" + name="cof_accordionpanel" + width="310" + start_folder="Current Outfit"/> + </accordion_tab> + </accordion> + <button bottom="0" halign="center" height="16" |