diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-08-13 17:58:01 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-08-13 17:58:01 -0400 |
| commit | 383edf8015743becc37650ab018a112b9ff347b1 (patch) | |
| tree | 1e9a33f1517c6fff3416f5426de525628f1d29c2 /indra/newview/llfloatersidepanelcontainer.cpp | |
| parent | d56958e68934e673195ec2966e0a3c20dac7fb41 (diff) | |
| parent | 06b605b8666f2336e77126f8ff47765115c08a27 (diff) | |
merge changes for MAINT-4356
Diffstat (limited to 'indra/newview/llfloatersidepanelcontainer.cpp')
| -rwxr-xr-x | indra/newview/llfloatersidepanelcontainer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatersidepanelcontainer.cpp b/indra/newview/llfloatersidepanelcontainer.cpp index c5248719e9..aee20ff706 100755 --- a/indra/newview/llfloatersidepanelcontainer.cpp +++ b/indra/newview/llfloatersidepanelcontainer.cpp @@ -57,7 +57,7 @@ void LLFloaterSidePanelContainer::onOpen(const LLSD& key) getChild<LLPanel>(sMainPanelName)->onOpen(key); } -void LLFloaterSidePanelContainer::onClickCloseBtn(bool) +void LLFloaterSidePanelContainer::closeFloater(bool app_quitting) { LLPanelOutfitEdit* panel_outfit_edit = dynamic_cast<LLPanelOutfitEdit*>(LLFloaterSidePanelContainer::getPanel("appearance", "panel_outfit_edit")); @@ -75,7 +75,7 @@ void LLFloaterSidePanelContainer::onClickCloseBtn(bool) } } - LLFloater::onClickCloseBtn(); + LLFloater::closeFloater(app_quitting); } LLPanel* LLFloaterSidePanelContainer::openChildPanel(const std::string& panel_name, const LLSD& params) |