diff --git a/indra/newview/llinventorylistitem.cpp b/indra/newview/llinventorylistitem.cpp index 2c2432f0f8..452a195a3f 100644 --- a/indra/newview/llinventorylistitem.cpp +++ b/indra/newview/llinventorylistitem.cpp @@ -144,7 +144,6 @@ void LLPanelInventoryListItemBase::addWidgetToRightSide(const std::string& name, void LLPanelInventoryListItemBase::addWidgetToRightSide(LLUICtrl* ctrl, bool show_widget/* = true*/) { - if (ctrl == nullptr)return; // avoid crash if ctrl is null mRightSideWidgets.push_back(ctrl); setShowWidget(ctrl, show_widget); } diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp index 9db4dc5f3f..0b6350d169 100644 --- a/indra/newview/llwearableitemslist.cpp +++ b/indra/newview/llwearableitemslist.cpp @@ -116,16 +116,10 @@ bool LLPanelWearableOutfitItem::postBuild() LLPanelWearableListItem::postBuild(); - //if(mShowWidgets) // Make Add/Remove buttons work + if(mShowWidgets) { - // Make Add/Remove buttons work - //addWidgetToRightSide(mAddWearableBtn); - //addWidgetToRightSide(mAddWearableBtn); - LLViewerInventoryItem* inv_item = getItem(); - mShowWidgets &= (inv_item->getType() != LLAssetType::AT_BODYPART); - addWidgetToRightSide(mAddWearableBtn, mShowWidgets); - addWidgetToRightSide(mAddWearableBtn, mShowWidgets); - // + addWidgetToRightSide(mAddWearableBtn); + addWidgetToRightSide(mRemoveWearableBtn); mAddWearableBtn->setClickedCallback(boost::bind(&LLPanelWearableOutfitItem::onAddWearable, this)); mRemoveWearableBtn->setClickedCallback(boost::bind(&LLPanelWearableOutfitItem::onRemoveWearable, this));