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

FIRE-22509: Only apply inbox filter on primary inventory window

master
Ansariel 2018-04-18 22:54:56 +02:00
parent 0b2217fbc0
commit ca873b3664
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
indra/newview/llpanelmaininventory.cpp
View File

@ -691,15 +691,26 @@ void LLPanelMainInventory::onClearSearch()
}
mFilterSubString = "";
LLSidepanelInventory * sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
if (sidepanel_inventory)
// <FS:Ansariel> FIRE-22509: Only apply inbox filter on primary inventory window
//LLSidepanelInventory * sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
//if (sidepanel_inventory)
//{
// LLPanelMarketplaceInbox* inbox_panel = sidepanel_inventory->getChild<LLPanelMarketplaceInbox>("marketplace_inbox");
// if (inbox_panel)
// {
// inbox_panel->onClearSearch();
// }
//}
LLFloater* inv_floater = getParentByType<LLFloater>();
if (inv_floater)
{
LLPanelMarketplaceInbox* inbox_panel = sidepanel_inventory->getChild<LLPanelMarketplaceInbox>("marketplace_inbox");
LLPanelMarketplaceInbox* inbox_panel = inv_floater->findChild<LLPanelMarketplaceInbox>("marketplace_inbox");
if (inbox_panel)
{
inbox_panel->onClearSearch();
}
}
// </FS:Ansariel>
}
void LLPanelMainInventory::onFilterEdit(const std::string& search_string )
@ -754,15 +765,26 @@ void LLPanelMainInventory::onFilterEdit(const std::string& search_string )
}
// </FS:Ansariel> Separate search for inventory tabs from Satomi Ahn (FIRE-913 & FIRE-6862)
LLSidepanelInventory * sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
if (sidepanel_inventory)
// <FS:Ansariel> FIRE-22509: Only apply inbox filter on primary inventory window
//LLSidepanelInventory * sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
//if (sidepanel_inventory)
//{
// LLPanelMarketplaceInbox* inbox_panel = sidepanel_inventory->getChild<LLPanelMarketplaceInbox>("marketplace_inbox");
// if (inbox_panel)
// {
// inbox_panel->onFilterEdit(search_string);
// }
//}
LLFloater* inv_floater = getParentByType<LLFloater>();
if (inv_floater)
{
LLPanelMarketplaceInbox* inbox_panel = sidepanel_inventory->getChild<LLPanelMarketplaceInbox>("marketplace_inbox");
LLPanelMarketplaceInbox* inbox_panel = inv_floater->findChild<LLPanelMarketplaceInbox>("marketplace_inbox");
if (inbox_panel)
{
inbox_panel->onFilterEdit(search_string);
}
}
// </FS:Ansariel>
}
// <FS:Zi> Filter dropdown