livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix inventory filter issues: 

* Ansastorm already has a button for the filter floater and doesn't need one in the bottom bar
* Coalesced option missing in combobox for Vintage
* Inventory links are not created in the tools floater
master
Ansariel 2025-01-13 17:15:22 +01:00
parent 610917acfb
commit 2a31becf1c
4 changed files with 4 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
indra/newview/skins/ansastorm/xui/en/panel_main_inventory.xml
View File

@ -738,11 +738,8 @@
<combo_box.item value="filter_type_snapshots" label="Snapshots" />
<combo_box.item value="filter_type_materials" label="Materials" />
<combo_box.item value="filter_type_settings" label="Settings" />
<!-- <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible -->
<combo_box.item value="filter_separator" label="------------" enabled="false" />
<!-- Add new custom filter to toggle Only Coalesced on and switch to filter_type_objects as only objects can be combined -->
<combo_box.item value="filter_type_coalesced" label="Only Coalesced"/>
<!-- </FS:minerjr> [FIRE-35042] -->
<combo_box.item value="filter_separator" label="------------" enabled="false" />
<combo_box.item value="filter_type_custom" label="Custom..." />
</combo_box>
@ -999,43 +996,11 @@
parameter="secondary_inventory" />
</button>
</panel>
<!-- <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible -->
<!-- This is a new panel button for adding an on screen visual indicator that shows when any filter is enabled -->
<!-- A new inventory image was required to be used -->
<panel
follows="top|left"
height="25"
layout="topleft"
left_pad="0"
name="show_filters_panel"
width="32">
<button
follows="top|left"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="show_filters_18"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
left="0"
name="show_filters_inv_btn"
tool_tip="Show Filters - Shows the filter side menu when selected. Becomes highlighted when any filter is enabled."
top="0"
width="31">
<button.commit_callback
function="Inventory.GearDefault.Custom.Action"
parameter="show_filters" />
<button.is_toggled_callback
function="Inventory.ShowFilters.Check"
parameter="show_filters_modified" />
</button>
</panel>
<!-- </FS:minerjr> [FIRE-35042] -->
<panel
follows="top|left|right"
height="25"
layout="topleft"
left_pad="0"
name="view_mode_panel"
width="32">
<button

2
indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
View File

@ -312,7 +312,7 @@
layout="topleft"
left="8"
top_pad="6"
tool_tip="Filters linked objects - objects can be linked in the Tools menu in edit mode"
tool_tip="Filters linked objects"
name="inventory_filter_show_links_combo"
width="120">
<combo_box.item name="show_links"

9
indra/newview/skins/default/xui/en/panel_main_inventory.xml
View File

@ -182,11 +182,8 @@
<combo_box.item value="filter_type_snapshots" label="Snapshots" />
<combo_box.item value="filter_type_materials" label="Materials" />
<combo_box.item value="filter_type_settings" label="Settings" />
<!-- <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible -->
<combo_box.item value="filter_separator" label="------------" enabled="false" />
<!-- Add new custom filter to toggle Only Coalesced on and switch to filter_type_objects as only objects can be combined -->
<combo_box.item value="filter_type_coalesced" label="Only Coalesced"/>
<!-- </FS:minerjr> [FIRE-35042] -->
<combo_box.item value="filter_separator" label="------------" enabled="false" />
<combo_box.item value="filter_type_custom" label="Custom..." />
</combo_box>
@ -416,9 +413,6 @@
parameter="secondary_inventory" />
</button>
</panel>
<!-- <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible -->
<!-- This is a new panel button for adding an on screen visual indicator that shows when any filter is enabled -->
<!-- A new inventory image was required to be used -->
<panel
follows="top|left"
height="25"
@ -441,13 +435,12 @@
width="31">
<button.commit_callback
function="Inventory.GearDefault.Custom.Action"
parameter="show_filters" />
parameter="show_filters" />
<button.is_toggled_callback
function="Inventory.ShowFilters.Check"
parameter="show_filters_modified" />
</button>
</panel>
<!-- </FS:minerjr> [FIRE-35042] -->
<panel
follows="top|left"
height="25"

2
indra/newview/skins/vintage/xui/en/panel_main_inventory.xml
View File

@ -787,6 +787,8 @@
<combo_box.item value="filter_type_materials" label="Materials" />
<combo_box.item value="filter_type_settings" label="Settings" />
<combo_box.item value="filter_separator" label="------------" enabled="false" />
<combo_box.item value="filter_type_coalesced" label="Only Coalesced"/>
<combo_box.item value="filter_separator" label="------------" enabled="false" />
<combo_box.item value="filter_type_custom" label="Custom..." />
</combo_box>