diff options
author | Oz Linden <oz@lindenlab.com> | 2018-06-21 15:31:21 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2018-06-21 15:31:21 -0400 |
commit | 3cdce9bf24ebac1c48b30955910a8f6b36797cb5 (patch) | |
tree | 5f731c4237dfe544e475c7d5f119aa2c6e8edcb8 /indra/newview/llpaneloutfitedit.cpp | |
parent | c0e00cc61750d2b1bba3ada6622023df4725b1a4 (diff) | |
parent | dc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff) |
merge changes for 5.1.6-release
Diffstat (limited to 'indra/newview/llpaneloutfitedit.cpp')
-rw-r--r-- | indra/newview/llpaneloutfitedit.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index 5973b08183..c5bae9c52e 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -531,11 +531,6 @@ BOOL LLPanelOutfitEdit::postBuild() mPlusBtn = getChild<LLButton>("plus_btn"); mPlusBtn->setClickedCallback(boost::bind(&LLPanelOutfitEdit::onPlusBtnClicked, this)); - - mEditWearableBtn = getChild<LLButton>("edit_wearable_btn"); - mEditWearableBtn->setEnabled(FALSE); - mEditWearableBtn->setVisible(FALSE); - mEditWearableBtn->setCommitCallback(boost::bind(&LLPanelOutfitEdit::onEditWearableClicked, this)); childSetAction(REVERT_BTN, boost::bind(&LLAppearanceMgr::wearBaseOutfit, LLAppearanceMgr::getInstance())); |