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

Follow up for 4fa41c5 breaking inbox search/hiding (#2356)

master
Rye Mutt 2024-08-20 02:21:57 -04:00 committed by GitHub
parent 342eee5038
commit f92c2040b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llpanelmaininventory.cpp
View File

@ -239,11 +239,6 @@ bool LLPanelMainInventory::postBuild()
}
}
mParentSidepanel = getParentSidepanelInventory();
if (mParentSidepanel)
{
mInboxPanel = mParentSidepanel->getChild<LLPanelMarketplaceInbox>("marketplace_inbox");
}
mFilterEditor = getChild<LLFilterEditor>("inventory search editor");
if (mFilterEditor)

3
indra/newview/llpanelmaininventory.h
View File

@ -139,6 +139,9 @@ public:
LLInventoryFilter& getCurrentFilter();
void setParentSidepanel(LLSidepanelInventory* parent_sidepanel) { mParentSidepanel = parent_sidepanel; }
void setInboxPanel(LLPanelMarketplaceInbox* inbox_panel) { mInboxPanel = inbox_panel; }
protected:
//
// Misc functions

2
indra/newview/llsidepanelinventory.cpp
View File

@ -161,6 +161,8 @@ bool LLSidepanelInventory::postBuild()
mPanelMainInventory = mInventoryPanel->getChild<LLPanelMainInventory>("panel_main_inventory");
mPanelMainInventory->setSelectCallback(boost::bind(&LLSidepanelInventory::onSelectionChange, this, _1, _2));
mPanelMainInventory->setParentSidepanel(this);
mPanelMainInventory->setInboxPanel(getChild<LLPanelMarketplaceInbox>("marketplace_inbox"));
//LLTabContainer* tabs = mPanelMainInventory->getChild<LLTabContainer>("inventory filter tabs");
//tabs->setCommitCallback(boost::bind(&LLSidepanelInventory::updateVerbs, this));