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

Fix findChild calls when inputting text into inventory search

meow-7.2.2
Rye Mutt 2024-08-18 15:54:15 -04:00
parent 9827dff971
commit 4fa41c5c78
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/llpanelmaininventory.cpp
View File

@ -239,6 +239,11 @@ bool LLPanelMainInventory::postBuild()
}
}
mParentSidepanel = getParentSidepanelInventory();
if (mParentSidepanel)
{
mInboxPanel = mParentSidepanel->getChild<LLPanelMarketplaceInbox>("marketplace_inbox");
}
mFilterEditor = getChild<LLFilterEditor>("inventory search editor");
if (mFilterEditor)
@ -761,14 +766,9 @@ void LLPanelMainInventory::onClearSearch()
}
mFilterSubString = "";
LLSidepanelInventory * sidepanel_inventory = getParentSidepanelInventory();
if (sidepanel_inventory)
if (mInboxPanel)
{
LLPanelMarketplaceInbox* inbox_panel = sidepanel_inventory->getChild<LLPanelMarketplaceInbox>("marketplace_inbox");
if (inbox_panel)
{
inbox_panel->onClearSearch();
}
mInboxPanel->onClearSearch();
}
}
@ -818,14 +818,9 @@ void LLPanelMainInventory::onFilterEdit(const std::string& search_string )
// set new filter string
setFilterSubString(mFilterSubString);
LLSidepanelInventory * sidepanel_inventory = getParentSidepanelInventory();
if (sidepanel_inventory)
if (mInboxPanel)
{
LLPanelMarketplaceInbox* inbox_panel = sidepanel_inventory->getChild<LLPanelMarketplaceInbox>("marketplace_inbox");
if (inbox_panel)
{
inbox_panel->onFilterEdit(search_string);
}
mInboxPanel->onFilterEdit(search_string);
}
}
@ -1578,16 +1573,15 @@ void LLPanelMainInventory::toggleViewMode()
updateTitle();
onFilterSelected();
LLSidepanelInventory* sidepanel_inventory = getParentSidepanelInventory();
if (sidepanel_inventory)
if (mParentSidepanel)
{
if(mSingleFolderMode)
{
sidepanel_inventory->hideInbox();
mParentSidepanel->hideInbox();
}
else
{
sidepanel_inventory->toggleInbox();
mParentSidepanel->toggleInbox();
}
}
}

5
indra/newview/llpanelmaininventory.h
View File

@ -49,6 +49,8 @@ class LLSidepanelInventory;
class LLToggleableMenu;
class LLFloater;
class LLFloaterSidePanelContainer;
class LLSidepanelInventory;
class LLPanelMarketplaceInbox;
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLPanelMainInventory
@ -244,6 +246,9 @@ protected:
void setUploadCostIfNeeded();
void disableAddIfNeeded();
private:
LLSidepanelInventory* mParentSidepanel = nullptr;
LLPanelMarketplaceInbox* mInboxPanel = nullptr;
LLToggleableMenu* mMenuGearDefault;
LLToggleableMenu* mMenuViewDefault;
LLToggleableMenu* mMenuVisibility;