diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-02-01 15:59:08 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-02-01 15:59:08 -0700 |
| commit | f07b332ef0aafd1ecb82b6077309a5292c9cddc1 (patch) | |
| tree | a76fabd4f71bdbb86b7fe6efb9a6acc0529a429c /indra/newview/llfloatersidepanelcontainer.cpp | |
| parent | baa81473149b9d5a6718529c4de08393e8a02b92 (diff) | |
| parent | 21565a1f3fe1ae737e2f91c58be2c3cb0b5a2fec (diff) | |
Merge branch 'master' into DV525-merge-6.4.13
Diffstat (limited to 'indra/newview/llfloatersidepanelcontainer.cpp')
| -rw-r--r-- | indra/newview/llfloatersidepanelcontainer.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/llfloatersidepanelcontainer.cpp b/indra/newview/llfloatersidepanelcontainer.cpp index 64ddeff1b0..dd7ce40e97 100644 --- a/indra/newview/llfloatersidepanelcontainer.cpp +++ b/indra/newview/llfloatersidepanelcontainer.cpp @@ -60,7 +60,7 @@ void LLFloaterSidePanelContainer::onOpen(const LLSD& key) void LLFloaterSidePanelContainer::closeFloater(bool app_quitting) { LLPanelOutfitEdit* panel_outfit_edit = - dynamic_cast<LLPanelOutfitEdit*>(LLFloaterSidePanelContainer::getPanel("appearance", "panel_outfit_edit")); + dynamic_cast<LLPanelOutfitEdit*>(LLFloaterSidePanelContainer::findPanel("appearance", "panel_outfit_edit")); if (panel_outfit_edit) { LLFloater *parent = gFloaterView->getParentFloater(panel_outfit_edit); @@ -145,3 +145,15 @@ LLPanel* LLFloaterSidePanelContainer::getPanel(const std::string& floater_name, return NULL; } + +LLPanel* LLFloaterSidePanelContainer::findPanel(const std::string& floater_name, const std::string& panel_name) +{ + LLFloaterSidePanelContainer* floaterp = LLFloaterReg::findTypedInstance<LLFloaterSidePanelContainer>(floater_name); + + if (floaterp) + { + return floaterp->findChild<LLPanel>(panel_name, true); + } + + return NULL; +} |