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

[FIRE-35042] - Reverted wording back to Only Coalesced + minor fixes 

Based upon feedback, reverted back to using "Only Coalesced" throughout the UI.
Changed the left/right order of the icon and checkbox on the Filter Panel to be better aligned with the other options.
Changed the Only Coalesced check button on the main UI into a universal Show Filters button that shows that any filter is enabled.
Created new Icon image for the filter and added it to the list.
Removed the OnlyCoalesced previous image as it was not needed now.
Cleaned up the code to use the same sync mFilter object to talk between the Finger(Filter) window and the main inventory window.
Added new Show Links filter to the Finder window as a combo box, with three values.
0 - Show Links, 2 - Show Links Only, 1 - Hide Links. This is to match the order on the Gear menu.
Added new feature, where if any filter is turned on, now the bottom inventory show filter button will be highlighted. If you reset or manually turn off the filter it will turn off. This includes setting the Always Show folders check box and the Show Links which did not cause the isNotDefault flag to be true when set.
Works with the second inventory window as well and they don't have conflicts.
master
minerjr 2025-01-11 21:29:48 -04:00
parent 81dab70f7d
commit 1adfbb975b
11 changed files with 220 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
indra/newview/llpanelmaininventory.cpp
View File

@ -98,11 +98,10 @@ public:
void onCreatorSelfFilterCommit();
void onCreatorOtherFilterCommit();
// <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible
// Callback to check the value of the check box to sync with the main inventory Only Coalesced flag
bool isOnlyCoalescedFilterChecked();
// Callback for new checkbox to modify the main inventory's Only Colesced filter (Combined (Clumps))
void onOnlyCoalescedFilterCommit();
void onOnlyCoalescedFilterCommit(); // Commit method for the Only Coalesced Filter checkbox
void onShowLinksFilterCommit(); // Commit method for the Show Links Filter combo box
// </FS:minerjr> [FIRE-35042]
void onPermissionsChanged(); // <FS:Zi> FIRE-1175 - Filter Permissions Menu
@ -122,7 +121,8 @@ private:
LLCheckBoxCtrl* mCreatorOthers;
LLInventoryFilter* mFilter;
// <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible
LLCheckBoxCtrl* mOnlyCoalescedFilterCheck; // Store the pointer to the Only Coalesced filter checkbox
LLCheckBoxCtrl* mOnlyCoalescedFilterCheck; // Stores the pointer to the Only Coalesced filter checkbox
LLComboBox* mShowLinksFilterCombo; // Stores the pointer to the Show Links filter combo box
// </FS:minerjr> [FIRE-35042]
};
@ -200,6 +200,12 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p)
mEnableCallbackRegistrar.add("Inventory.GearDefault.Visible", boost::bind(&LLPanelMainInventory::isActionVisible, this, _2));
// </FS:Ansariel>
// <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible
// Added new button to show all filters, not just Only Coalesced Filter
// Add a call back on the existing Inventory ShowFilters Check on the show_filters_inv_btn
mEnableCallbackRegistrar.add("Inventory.ShowFilters.Check", boost::bind(&LLPanelMainInventory::isAnyFilterChecked, this, _2));
// </FS:minerjr> [FIRE-35042]
mSavedFolderState = new LLSaveFolderState();
mSavedFolderState->setApply(false);
@ -917,6 +923,31 @@ bool LLPanelMainInventory::isSortByChecked(const LLSD& userdata)
}
// </FS:Zi> Sort By menu handlers
// <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible
// Callback method used to update the Show Filter button on the inventory bottom UI
bool LLPanelMainInventory::isAnyFilterChecked(const LLSD& userdata)
{
// Validate that the command came from the right check box (Show Filters Modified)
const std::string command_name = userdata.asString();
if (command_name == "show_filters_modified")
{
// Only use thte active panel if it is valid
if (mActivePanel)
{
// Get the current filter object
LLInventoryFilter& filter = getCurrentFilter();
// If either of the three filter checks are true, Is Not Default, Filter Creator Type is not set to all creators,
// and Show Folder State is set to show folder state then we need to turn on the Show Filter Button check higlight,
// so return true if any of these are true.
return filter.isNotDefault() || filter.getFilterCreatorType() != LLInventoryFilter::FILTERCREATOR_ALL ||
filter.getShowFolderState() == LLInventoryFilter::SHOW_ALL_FOLDERS;
}
}
return false;
}
// </FS:minerjr> [FIRE-35042]
// static
bool LLPanelMainInventory::filtersVisible(void* user_data)
{
@ -1545,13 +1576,19 @@ bool LLFloaterInventoryFinder::postBuild()
// <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible
// Get the Finder's Only Coalesced check box for use later on, instead of calling getChild everytime accessing it
mOnlyCoalescedFilterCheck = getChild<LLCheckBoxCtrl>("check_only_coalesced");
// Add callbacks only if the checkbox is available
// If the checkbox could be found, then set the commit callback to onOnlyCoalescedFilterCommit to update the mFilter object
// with the value in the checkbox.
if (mOnlyCoalescedFilterCheck)
{
// Set a callback for when the check_only_coalesced checkbox is pressed to change the value of the main panel.
mOnlyCoalescedFilterCheck->setCommitCallback(boost::bind(&LLFloaterInventoryFinder::onOnlyCoalescedFilterCommit, this));
// Set a callback for syncing the check_only_coalesced check state to the Only Coalesced flag of the main inventory
mOnlyCoalescedFilterCheck->setCheckCallback(boost::bind(&LLFloaterInventoryFinder::isOnlyCoalescedFilterChecked, this));
}
// Get the Finder's Show Links Filter combobox for use later as well to also prevent having to call get child everytime accessing it.
mShowLinksFilterCombo = getChild<LLComboBox>("inventory_filter_show_links_combo");
// If the combobox could be found, then set the commit callback to onShowLinksFilterCommit to update the mFilter object
// with the value in the checkbox.
if (mShowLinksFilterCombo)
{
mShowLinksFilterCombo->setCommitCallback(boost::bind(&LLFloaterInventoryFinder::onShowLinksFilterCommit, this));
}
// </FS:minerjr> [FIRE-35042]
@ -1559,7 +1596,7 @@ bool LLFloaterInventoryFinder::postBuild()
// <FS:Ansariel> FIRE-5160: Don't reset inventory filter when clearing search term
getChild<LLButton>("btnReset")->setClickedCallback(boost::bind(&LLFloaterInventoryFinder::onResetBtn, this));
updateElementsFromFilter();
// <FS:Zi> FIRE-1175 - Filter Permissions Menu
@ -1624,14 +1661,16 @@ void LLFloaterInventoryFinder::updateElementsFromFilter()
return;
// Get data needed for filter display
U32 filter_types = (U32)mFilter->getFilterObjectTypes();
LLInventoryFilter::EFolderShow show_folders = mFilter->getShowFolderState();
U32 hours = mFilter->getHoursAgo();
U32 date_search_direction = mFilter->getDateSearchDirection();
U32 filter_types = (U32)mFilter->getFilterObjectTypes();
LLInventoryFilter::EFolderShow show_folders = mFilter->getShowFolderState();
U32 hours = mFilter->getHoursAgo();
U32 date_search_direction = mFilter->getDateSearchDirection();
LLInventoryFilter::EFilterCreatorType filter_creator = mFilter->getFilterCreatorType();
bool show_created_by_me = ((filter_creator == LLInventoryFilter::FILTERCREATOR_ALL) || (filter_creator == LLInventoryFilter::FILTERCREATOR_SELF));
bool show_created_by_others = ((filter_creator == LLInventoryFilter::FILTERCREATOR_ALL) || (filter_creator == LLInventoryFilter::FILTERCREATOR_OTHERS));
bool show_created_by_me =
((filter_creator == LLInventoryFilter::FILTERCREATOR_ALL) || (filter_creator == LLInventoryFilter::FILTERCREATOR_SELF));
bool show_created_by_others =
((filter_creator == LLInventoryFilter::FILTERCREATOR_ALL) || (filter_creator == LLInventoryFilter::FILTERCREATOR_OTHERS));
// update the ui elements
// <FS:PP> Make floater title translatable
@ -1639,19 +1678,19 @@ void LLFloaterInventoryFinder::updateElementsFromFilter()
setTitle(LLTrans::getString(mFilter->getName()));
// </FS:PP>
getChild<LLUICtrl>("check_animation")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_ANIMATION));
getChild<LLUICtrl>("check_animation")->setValue((S32)(filter_types & 0x1 << LLInventoryType::IT_ANIMATION));
getChild<LLUICtrl>("check_calling_card")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_CALLINGCARD));
getChild<LLUICtrl>("check_clothing")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_WEARABLE));
getChild<LLUICtrl>("check_gesture")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_GESTURE));
getChild<LLUICtrl>("check_landmark")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_LANDMARK));
getChild<LLUICtrl>("check_material")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_MATERIAL));
getChild<LLUICtrl>("check_notecard")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_NOTECARD));
getChild<LLUICtrl>("check_object")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_OBJECT));
getChild<LLUICtrl>("check_script")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_LSL));
getChild<LLUICtrl>("check_sound")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_SOUND));
getChild<LLUICtrl>("check_texture")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_TEXTURE));
getChild<LLUICtrl>("check_snapshot")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_SNAPSHOT));
getChild<LLUICtrl>("check_calling_card")->setValue((S32)(filter_types & 0x1 << LLInventoryType::IT_CALLINGCARD));
getChild<LLUICtrl>("check_clothing")->setValue((S32)(filter_types & 0x1 << LLInventoryType::IT_WEARABLE));
getChild<LLUICtrl>("check_gesture")->setValue((S32)(filter_types & 0x1 << LLInventoryType::IT_GESTURE));
getChild<LLUICtrl>("check_landmark")->setValue((S32)(filter_types & 0x1 << LLInventoryType::IT_LANDMARK));
getChild<LLUICtrl>("check_material")->setValue((S32)(filter_types & 0x1 << LLInventoryType::IT_MATERIAL));
getChild<LLUICtrl>("check_notecard")->setValue((S32)(filter_types & 0x1 << LLInventoryType::IT_NOTECARD));
getChild<LLUICtrl>("check_object")->setValue((S32)(filter_types & 0x1 << LLInventoryType::IT_OBJECT));
getChild<LLUICtrl>("check_script")->setValue((S32)(filter_types & 0x1 << LLInventoryType::IT_LSL));
getChild<LLUICtrl>("check_sound")->setValue((S32)(filter_types & 0x1 << LLInventoryType::IT_SOUND));
getChild<LLUICtrl>("check_texture")->setValue((S32)(filter_types & 0x1 << LLInventoryType::IT_TEXTURE));
getChild<LLUICtrl>("check_snapshot")->setValue((S32)(filter_types & 0x1 << LLInventoryType::IT_SNAPSHOT));
getChild<LLUICtrl>("check_settings")->setValue((S32)(filter_types & 0x1 << LLInventoryType::IT_SETTINGS));
getChild<LLUICtrl>("check_show_empty")->setValue(show_folders == LLInventoryFilter::SHOW_ALL_FOLDERS);
@ -1664,10 +1703,30 @@ void LLFloaterInventoryFinder::updateElementsFromFilter()
getChild<LLRadioGroup>("date_search_direction")->setSelectedIndex(date_search_direction);
// <FS:Zi> FIRE-1175 - Filter Permissions Menu
getChild<LLUICtrl>("check_modify")->setValue((bool) (mFilter->getFilterPermissions() & PERM_MODIFY));
getChild<LLUICtrl>("check_copy")->setValue((bool) (mFilter->getFilterPermissions() & PERM_COPY));
getChild<LLUICtrl>("check_transfer")->setValue((bool) (mFilter->getFilterPermissions() & PERM_TRANSFER));
getChild<LLUICtrl>("check_modify")->setValue((bool)(mFilter->getFilterPermissions() & PERM_MODIFY));
getChild<LLUICtrl>("check_copy")->setValue((bool)(mFilter->getFilterPermissions() & PERM_COPY));
getChild<LLUICtrl>("check_transfer")->setValue((bool)(mFilter->getFilterPermissions() & PERM_TRANSFER));
// </FS:Zi>
// <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible
// Sync the Only Coalesced Filter Checkbox with the value from the mFilter
// Make sure the Only Coalseced Filter checkbox and the filter are valid before accessing them.
if (mOnlyCoalescedFilterCheck && mFilter)
{
// Set the check value to the value of the UI to the Only Coalesced Objects of the mFilter
mOnlyCoalescedFilterCheck->set(mFilter->getFilterCoalescedObjects());
}
// Sync the Show Links Filter combo box with the value from the mFilter
// Make sure the Show Links Filter combo box and filter are both valid
if (mShowLinksFilterCombo && mFilter)
{
// Set the combo box value to the value of the FitlerLinks of the mFilter
// In the UI, the choices match the same values as the filter values
// 0 - Show Links, 2 Show Links Only, 1 = Hide Links
// So we convert from the filters from U64 to LLSD (integer) as the SelectByValue takes a LLSD object as an input
mShowLinksFilterCombo->selectByValue(LLSD(mFilter->getFilterLinks()));
}
// </FS:minerjr> [FIRE-35042]
}
void LLFloaterInventoryFinder::draw()
@ -1864,41 +1923,6 @@ void LLFloaterInventoryFinder::onCreatorOtherFilterCommit()
}
}
// <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible
// Callback function that controls setting the actual Only Coalesced filter flag in the Main Inventory when the check_coalesced checkbox is changed by the user
void LLFloaterInventoryFinder::onOnlyCoalescedFilterCommit()
{
// If the Main Inventory Panel and the Finder's OnlyCoalescedFilterCheck are both valid (should be, but just in case)
if (mPanelMainInventory && mOnlyCoalescedFilterCheck)
{
// Make sure the main panel exists before trying to set the Filter Coalesced Objects value to the check_only_coalesced checkbox value
LLInventoryPanel* main_panel = mPanelMainInventory->getPanel();
if (main_panel)
{
main_panel->setFilterCoalescedObjects(mOnlyCoalescedFilterCheck->getValue());
}
}
}
// Callback function that syncs the Finder's Only Coalesced checkbox to the main panel's FilterCoalescedObjects value
bool LLFloaterInventoryFinder::isOnlyCoalescedFilterChecked()
{
// Check if the Main Inventory Panel exists (should be, but just in case)
if (mPanelMainInventory)
{
// Make sure the main panel exists before trying to get the Filter Coalesced Objects
LLInventoryPanel* main_panel = mPanelMainInventory->getPanel();
if (main_panel)
{
//Return the Only Coalesced filter value from the main inventory
return main_panel->getFilterCoalescedObjects();
}
}
//If the main panel cannot be accessed at this time, just return false
return false;
}
// </FS:minerjr> [FIRE-35042]
// <FS:Zi> FIRE-1175 - Filter Permissions Menu
void LLFloaterInventoryFinder::onPermissionsChanged()
{
@ -1923,6 +1947,30 @@ void LLFloaterInventoryFinder::onPermissionsChanged()
}
// </FS:Zi>
// <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible
// Callback method used to update the mFilter's Only Coalesced filter and syncs with the main inventory filter
void LLFloaterInventoryFinder::onOnlyCoalescedFilterCommit()
{
// This will sync the Filter panels value with the value of the mFilter object
if (mOnlyCoalescedFilterCheck && mFilter)
{
// Set the mFilter's Filter Coalesced Objects value to the Only Coalesced Filter Checkbox value
mFilter->setFilterCoalescedObjects(mOnlyCoalescedFilterCheck->getValue());
}
}
// Callback method used to update the mFilter's Show Links filter and syncs with the main inventory filter
void LLFloaterInventoryFinder::onShowLinksFilterCommit()
{
// This will sync the Show Links combo box with the value of the main inventory filter
if (mShowLinksFilterCombo)
{
// Set the mFilter's Filter Links value to the selected value of the Show Links Filter Combo.
// The values match up to the bit values that are used by the filter (0 = Show Links, 1 = Show Links Only, 2 = Hide Links)
mFilter->setFilterLinks((U64)mShowLinksFilterCombo->getSelectedValue().asInteger());
}
}
// </FS:minerjr> [FIRE-35042]
bool LLFloaterInventoryFinder::getCheckShowEmpty()
{
return getChild<LLUICtrl>("check_show_empty")->getValue();
@ -2809,6 +2857,14 @@ void LLPanelMainInventory::onCoalescedObjectsToggled(const LLSD& userdata)
{
getActivePanel()->setFilterCoalescedObjects(!getActivePanel()->getFilterCoalescedObjects());
}
// <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible
// Update the Filter Finder window with the change to the filters, so they can sync
if (getFinder())
{
getFinder()->updateElementsFromFilter();
}
// <FS:minerjr> [FIRE-35042]
}
bool LLPanelMainInventory::isCoalescedObjectsChecked(const LLSD& userdata)
@ -2841,6 +2897,13 @@ void LLPanelMainInventory::onFilterLinksChecked(const LLSD& userdata)
{
getActivePanel()->setFilterLinks(LLInventoryFilter::FILTERLINK_EXCLUDE_LINKS);
}
// <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible
// Update the Filter Finder window with the change to the filters, so they can sync
if (getFinder())
{
getFinder()->updateElementsFromFilter();
}
// <FS:minerjr> [FIRE-35042]
}
bool LLPanelMainInventory::isFilterLinksChecked(const LLSD& userdata)

6
indra/newview/llpanelmaininventory.h
View File

@ -189,6 +189,12 @@ protected:
bool isSortByChecked(const LLSD& userdata);
// </FS:Zi> Sort By menu handlers
// <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible
// Callback method for the new Show Filter button on the bottom button panel of the main inventory.
// Stays highlighted if any filter is enabled.
bool isAnyFilterChecked(const LLSD& userdata);
// </FS:minerjr> [FIRE-35042]
void saveTexture(const LLSD& userdata);
bool isSaveTextureEnabled(const LLSD& userdata);
void updateItemcountText();

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

@ -565,11 +565,9 @@
parameter="only_transfer" />
</menu_item_check>
<menu_item_separator />
<!-- <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible -->
<!-- Changed label from Only Coalesced to Only Combined (Clumps) to make it more descriptive and match the UI verbiage that creates the Coalesced objects -->
<menu_item_check
name="inventory_filter_coalesced_objects_only"
label="Only Combined (Clumps)">
label="Only Coalesced">
<on_click
function="Inventory.CoalescedObjects.Toggle"
parameter="coalesced_objects_only" />
@ -577,7 +575,6 @@
function="Inventory.CoalescedObjects.Check"
parameter="coalesced_objects_only" />
</menu_item_check>
<!-- </FS:minerjr> [FIRE-35042] -->
</menu>
</menu_bar>
@ -744,8 +741,7 @@
<!-- <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 -->
<!-- Changed label from Only Coalesced to Only Combined (Clumps) to make it more descriptive and match the UI verbiage that creates the Coalesced objects -->
<combo_box.item value="filter_type_coalesced" label="Only Combined (Clumps)"/>
<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..." />
@ -1004,40 +1000,39 @@
</button>
</panel>
<!-- <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible -->
<!-- This is a new panel button for adding a on screen visual indicator that Only Coalesced filter is enabled -->
<!-- Changed label from Only Coalesced to Only Combined (Clumps) to make it more descriptive and match the UI verbiage that creates the Coalesced objects -->
<!-- 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="only_coalesced_panel"
name="show_filters_panel"
width="32">
<button
follows="top|left"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="coalesced_18"
image_overlay="show_filters_18"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
left="0"
name="only_coalesced_inv_btn"
tool_tip="Only Combined (Clumps) - Enables filter that displays only Combined Objects (Clumps) which are made up of 2 or more prims"
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.CoalescedObjects.Toggle"
parameter="coalesced_objects_only" />
function="Inventory.GearDefault.Custom.Action"
parameter="show_filters" />
<button.is_toggled_callback
function="Inventory.CoalescedObjects.Check"
parameter="coalesced_objects_only" />
function="Inventory.ShowFilters.Check"
parameter="show_filters_modified" />
</button>
</panel>
<!-- </FS:minerjr> [FIRE-35042] -->
<panel
follows="top|left"
follows="top|left|right"
height="25"
layout="topleft"
left_pad="0"

BIN
indra/newview/skins/default/textures/bottomtray/show_filters_18.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 645 B

4
indra/newview/skins/default/textures/textures.xml
View File

@ -845,8 +845,8 @@ with the same filename but different name
<texture name="TrashItem_Off" file_name="icons/TrashItem_Off.png" preload="true" />
<texture name="TrashItem_Press" file_name="icons/TrashItem_Press.png" preload="true" />
<!-- <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible -->
<!-- New UI 18 px image created for inventory UI for Only Coalesced toggle -->
<texture name="coalesced_18" file_name="bottomtray/coalesced_18.png" preload="true" />
<!-- New UI 18 px image created for inventory UI for Show Filters toggle -->
<texture name="show_filters_18" file_name="bottomtray/show_filters_18.png" preload="true" />
<!-- </FS:minerjr> [FIRE-35042] -->
<texture name="inventory_18" file_name="bottomtray/inventory_18.png" preload="true" />
<texture name="chatbar_18" file_name="bottomtray/chatbar_18.png" preload="true" />

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

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<!-- <FS:Zi> Changed height from 512 to 528 in this block -->
<!-- <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible -->
<!-- Changed height from 528 to 568 to make room for new Only Coalesced filter -->
<!-- Changed height from 528 to 598 to make room for new Only Coalesced and Show Links filter -->
<floater
legacy_header_height="18"
can_minimize="false"
height="568"
height="598"
layout="topleft"
name="Inventory Finder"
help_topic="inventory_finder"
title="Inventory Recent Items"
width="160">
<!-- <FS:minerjr> [FIRE-35042] -->
<!-- </FS:minerjr> [FIRE-35042] -->
<icon
height="16"
image_name="Inv_Animation"
@ -285,24 +285,47 @@
<!-- </FS:Zi> -->
<!-- <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible -->
<!-- Added new check box to allow finder panel the ability to set and view the Only Coalesced flag -->
<icon
height="16"
image_name="Inv_Object_Multi"
layout="topleft"
left="8"
mouse_opaque="true"
name="icon_coalesced"
top_pad="6"
width="16" />
<!-- Switched icon and checkbox left/right order to better fit aesthetics of the rest of the panel -->
<check_box
height="16"
label="Combined (Clumps)"
label="Only Coalesced"
layout="topleft"
left_pad="2"
left="8"
name="check_only_coalesced"
top_pad="6"
width="106" />
<icon
height="16"
follows="left|top"
image_name="Inv_Object_Multi"
layout="topleft"
left_pad="3"
mouse_opaque="true"
name="icon_coalesced"
top_delta="0"
width="126" />
<!-- <FS:minerjr> [FIRE-35042] -->
width="16" />
<!-- Added combo box for the link filters -->
<!-- The order matches the order in the Gear->menu, but the values are the actual filter value, used to simplify the actual code -->
<combo_box
follows="left|top"
height="23"
layout="topleft"
left="8"
top_pad="6"
tool_tip="Filters linked objects - objects can be linked in the Tools menu in edit mode"
name="inventory_filter_show_links_combo"
width="120">
<combo_box.item name="show_links"
label="Show Links"
value="0"/>
<combo_box.item name="show_links_only"
label="Show Links Only"
value="2"/>
<combo_box.item name="hide_links"
label="Hide Links"
value="1"/>
</combo_box>
<!-- </FS:minerjr> [FIRE-35042] -->
<check_box
height="16"
label="Created by me"

7
indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
View File

@ -400,19 +400,16 @@
<!-- </FS:Zi> -->
<!-- <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects -->
<!-- <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible -->
<!-- Changed label from Only Coalesced to Only Combined (Clumps) to make it more descriptive and match the UI verbiage that creates the Coalesced objects -->
<menu_item_check
name="inventory_filter_coalesced_objects_only"
label="Only Combined (Clumps)">
label="Only Coalesced">
<on_click
function="Inventory.CoalescedObjects.Toggle"
parameter="coalesced_objects_only" />
<on_check
function="Inventory.CoalescedObjects.Check"
parameter="coalesced_objects_only" />
</menu_item_check>
<!-- </FS:minerjr> [FIRE-35042] -->
</menu_item_check>
<menu_item_separator>
<menu_item_separator.on_visible
function="Inventory.GearDefault.Visible"

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

@ -185,8 +185,7 @@
<!-- <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 -->
<!-- Changed label from Only Coalesced to Only Combined (Clumps) to make it more descriptive and match the UI verbiage that creates the Coalesced objects -->
<combo_box.item value="filter_type_coalesced" label="Only Combined (Clumps)"/>
<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..." />
@ -418,35 +417,34 @@
</button>
</panel>
<!-- <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible -->
<!-- This is a new panel button for adding a on screen visual indicator that Only Coalesced filter is enabled -->
<!-- Changed label from Only Coalesced to Only Combined (Clumps) to make it more descriptive and match the UI verbiage that creates the Coalesced objects -->
<!-- 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="only_coalesced_panel"
name="show_filters_panel"
width="32">
<button
follows="top|left"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="coalesced_18"
image_overlay="show_filters_18"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
left="0"
name="only_coalesced_inv_btn"
tool_tip="Only Combined (Clumps) - Enables filter that displays only Combined Objects (Clumps) which are made up of 2 or more prims"
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.CoalescedObjects.Toggle"
parameter="coalesced_objects_only" />
function="Inventory.GearDefault.Custom.Action"
parameter="show_filters" />
<button.is_toggled_callback
function="Inventory.CoalescedObjects.Check"
parameter="coalesced_objects_only" />
function="Inventory.ShowFilters.Check"
parameter="show_filters_modified" />
</button>
</panel>
<!-- </FS:minerjr> [FIRE-35042] -->

1
indra/newview/skins/default/xui/en/panel_preferences_UI.xml
View File

@ -1211,7 +1211,6 @@
width="270"
control_name="FSSplitInventorySearchOverTabs"
tool_tip="If enabled, it is possible to enter a different search term for each tab in inventory."/>
</panel>
<!--Toasts-->

22
indra/newview/skins/starlight/xui/en/panel_main_inventory.xml
View File

@ -184,8 +184,7 @@
<!-- <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 -->
<!-- Changed label from Only Coalesced to Only Combined (Clumps) to make it more descriptive and match the UI verbiage that creates the Coalesced objects -->
<combo_box.item value="filter_type_coalesced" label="Only Combined (Clumps)"/>
<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..." />
@ -417,35 +416,34 @@
</button>
</panel>
<!-- <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible -->
<!-- This is a new panel button for adding a on screen visual indicator that Only Coalesced filter is enabled -->
<!-- Changed label from Only Coalesced to Only Combined (Clumps) to make it more descriptive and match the UI verbiage that creates the Coalesced objects -->
<!-- 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="only_coalesced_panel"
name="show_filters_panel"
width="32">
<button
follows="top|left"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="coalesced_18"
image_overlay="show_filters_18"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
left="0"
name="only_coalesced_inv_btn"
tool_tip="Only Combined (Clumps) - Enables filter that displays only Combined Objects (Clumps) which are made up of 2 or more prims"
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.CoalescedObjects.Toggle"
parameter="coalesced_objects_only" />
function="Inventory.GearDefault.Custom.Action"
parameter="show_filters" />
<button.is_toggled_callback
function="Inventory.CoalescedObjects.Check"
parameter="coalesced_objects_only" />
function="Inventory.ShowFilters.Check"
parameter="show_filters_modified" />
</button>
</panel>
<!-- </FS:minerjr> [FIRE-35042] -->

22
indra/newview/skins/starlightcui/xui/en/panel_main_inventory.xml
View File

@ -186,8 +186,7 @@
<!-- <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 -->
<!-- Changed label from Only Coalesced to Only Combined (Clumps) to make it more descriptive and match the UI verbiage that creates the Coalesced objects -->
<combo_box.item value="filter_type_coalesced" label="Only Combined (Clumps)"/>
<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..." />
@ -420,35 +419,34 @@
</button>
</panel>
<!-- <FS:minerjr> [FIRE-35042] Inventory - Only Coalesced Filter - More accessible -->
<!-- This is a new panel button for adding a on screen visual indicator that Only Coalesced filter is enabled -->
<!-- Changed label from Only Coalesced to Only Combined (Clumps) to make it more descriptive and match the UI verbiage that creates the Coalesced objects -->
<!-- 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="only_coalesced_panel"
name="show_filters_panel"
width="32">
<button
follows="top|left"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="coalesced_18"
image_overlay="show_filters_18"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
left="0"
name="only_coalesced_inv_btn"
tool_tip="Only Combined (Clumps) - Enables filter that displays only Combined Objects (Clumps) which are made up of 2 or more prims"
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.CoalescedObjects.Toggle"
parameter="coalesced_objects_only" />
function="Inventory.GearDefault.Custom.Action"
parameter="show_filters" />
<button.is_toggled_callback
function="Inventory.CoalescedObjects.Check"
parameter="coalesced_objects_only" />
function="Inventory.ShowFilters.Check"
parameter="show_filters_modified" />
</button>
</panel>
<!-- </FS:minerjr> [FIRE-35042] -->