diff options
author | dolphin <dolphin@lindenlab.com> | 2013-10-22 13:40:52 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-10-22 13:40:52 -0700 |
commit | 93b1111507f5e5c812b6a9e8e47bdf7db67931a0 (patch) | |
tree | 214b852c8451409d5d355437ddad48199bef976a /indra/newview/llfloatersidepanelcontainer.cpp | |
parent | 03cc47698489929b66fbceb139e4c95d13392b9d (diff) | |
parent | 0d0a8d841cab3fbb569a7382b78b0b4fb485eefb (diff) |
Merge with viewer-bear
Diffstat (limited to 'indra/newview/llfloatersidepanelcontainer.cpp')
-rwxr-xr-x | indra/newview/llfloatersidepanelcontainer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatersidepanelcontainer.cpp b/indra/newview/llfloatersidepanelcontainer.cpp index 5f9556a870..c5248719e9 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() +void LLFloaterSidePanelContainer::onClickCloseBtn(bool) { LLPanelOutfitEdit* panel_outfit_edit = dynamic_cast<LLPanelOutfitEdit*>(LLFloaterSidePanelContainer::getPanel("appearance", "panel_outfit_edit")); |