diff options
| author | Rye Mutt <rye@alchemyviewer.org> | 2024-08-20 02:21:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-20 09:21:57 +0300 |
| commit | f92c2040b94da7eb4fb2ba3ae9f7f7233e2463b1 (patch) | |
| tree | 3d121c23b474b6efb4cbdbfad8b910bdcdb85877 /indra | |
| parent | 342eee503865af8ee193a1d04f0bc80712c5d80c (diff) | |
Follow up for 4fa41c5 breaking inbox search/hiding (#2356)
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llpanelmaininventory.h | 3 | ||||
| -rw-r--r-- | indra/newview/llsidepanelinventory.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 8334da1836..2466ee5973 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -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) diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index c1c7e9a7ab..3347ab904b 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -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 diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp index 9b7289df67..5693f2808c 100644 --- a/indra/newview/llsidepanelinventory.cpp +++ b/indra/newview/llsidepanelinventory.cpp @@ -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)); |