1 files changed, 10 insertions, 12 deletions

diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index 973ffc2e07..60ebb9416e 100644
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -184,14 +184,14 @@ LLPanelClothingListItem::LLPanelClothingListItem(LLViewerInventoryItem* item, co
 	addChild(edit_panelp);
 
 	if (lock_panelp)
-	{
+{
 		LLIconCtrl::Params icon_params = params.lock_icon;
 		applyXUILayout(icon_params, this);
 		lock_panelp->addChild(LLUICtrlFactory::create<LLIconCtrl>(icon_params));
-	}
+}
 
 	if (edit_panelp)
-	{
+{
 		button_params = params.edit_btn;
 		applyXUILayout(button_params, this);
 		edit_panelp->addChild(LLUICtrlFactory::create<LLButton>(button_params));
@@ -265,10 +265,10 @@ LLPanelBodyPartsListItem::LLPanelBodyPartsListItem(LLViewerInventoryItem* item,
 		LLButton::Params btn_params = params.edit_btn;
 		applyXUILayout(btn_params, this);
 		edit_panelp->addChild(LLUICtrlFactory::create<LLButton>(btn_params));
-	}
+}
 
 	if (lock_panelp)
-	{
+{
 		LLIconCtrl::Params icon_params = params.lock_icon;
 		applyXUILayout(icon_params, this);
 		lock_panelp->addChild(LLUICtrlFactory::create<LLIconCtrl>(icon_params));
@@ -419,11 +419,11 @@ LLPanelDummyClothingListItem::LLPanelDummyClothingListItem(LLWearableType::EType
 	addChild(add_panelp);
 
 	if (add_panelp)
-	{
+{
 		LLButton::Params button_params(params.add_btn);
 		applyXUILayout(button_params, this);
 		add_panelp->addChild(LLUICtrlFactory::create<LLButton>(button_params));
-	}
+}
 
 	setSeparatorVisible(true);
 }
@@ -676,8 +676,8 @@ LLContextMenu* LLWearableItemsList::ContextMenu::createMenu()
 	const uuid_vec_t& ids = mUUIDs;		// selected items IDs
 	LLUUID selected_id = ids.front();	// ID of the first selected item
 
-	functor_t wear = boost::bind(&LLAppearanceMgr::wearItemOnAvatar, LLAppearanceMgr::getInstance(), _1, true, true);
-	functor_t add = boost::bind(&LLAppearanceMgr::wearItemOnAvatar, LLAppearanceMgr::getInstance(), _1, true, false);
+	functor_t wear = boost::bind(&LLAppearanceMgr::wearItemOnAvatar, LLAppearanceMgr::getInstance(), _1, true, true, LLPointer<LLInventoryCallback>(NULL));
+	functor_t add = boost::bind(&LLAppearanceMgr::wearItemOnAvatar, LLAppearanceMgr::getInstance(), _1, true, false, LLPointer<LLInventoryCallback>(NULL));
 	functor_t take_off = boost::bind(&LLAppearanceMgr::removeItemFromAvatar, LLAppearanceMgr::getInstance(), _1);
 
 	// Register handlers common for all wearable types.
@@ -825,10 +825,8 @@ void LLWearableItemsList::ContextMenu::updateItemsLabels(LLContextMenu* menu)
 	LLViewerInventoryItem* item = gInventory.getLinkedItem(mUUIDs.back());
 	if (!item || !item->isWearableType()) return;
 
-	LLStringUtil::format_map_t args;
 	LLWearableType::EType w_type = item->getWearableType();
-	args["[WEARABLE_TYPE]"] = LLWearableType::getTypeDefaultNewName(w_type);
-	std::string new_label = LLTrans::getString("CreateNewWearable", args);
+	std::string new_label = LLTrans::getString("create_new_" + LLWearableType::getTypeName(w_type));
 
 	LLMenuItemGL* menu_item = menu->getChild<LLMenuItemGL>("create_new");
 	menu_item->setLabel(new_label);