From 5fcdff31253231c6a63fe05560be9a65fb0de575 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Mon, 21 Jun 2010 14:34:08 +0300
Subject: EXT-7797 FIXED Outfit Editor: Clicking fliter button should set focus
 in filter field

- Set focus on filter field

Reviewed by Mike Antipov and Neal Orman at https://codereview.productengine.com/secondlife/r/598/

--HG--
branch : product-engine
---
 indra/newview/llpaneloutfitedit.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/llpaneloutfitedit.cpp')

diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 5fac7efb84..7a588193c8 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -452,6 +452,10 @@ void LLPanelOutfitEdit::showWearablesFilter()
 		mSearchFilter->clear();
 		onSearchEdit(LLStringUtil::null);
 	}
+	else
+	{
+		mSearchFilter->setFocus(TRUE);
+	}
 }
 
 void LLPanelOutfitEdit::showWearablesListView()
-- 
cgit v1.3


From baddb7154981f038ddf0218788a932d46e2b69ce Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Mon, 21 Jun 2010 15:14:42 +0300
Subject: EXT-7822 WIP changed the default plus button action from add to
 replace

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/617

--HG--
branch : product-engine
---
 indra/newview/llpaneloutfitedit.cpp                      | 7 ++++---
 indra/newview/llpaneloutfitedit.h                        | 2 +-
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'indra/newview/llpaneloutfitedit.cpp')

diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 7a588193c8..6b5eb23a9b 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -371,7 +371,7 @@ BOOL LLPanelOutfitEdit::postBuild()
 
 	childSetAction("show_add_wearables_btn", boost::bind(&LLPanelOutfitEdit::onAddMoreButtonClicked, this));
 
-	childSetAction("add_to_outfit_btn", boost::bind(&LLPanelOutfitEdit::onAddToOutfitClicked, this));
+	childSetAction("plus_btn", boost::bind(&LLPanelOutfitEdit::onPlusBtnClicked, this));
 	
 	mEditWearableBtn = getChild<LLButton>("edit_wearable_btn");
 	mEditWearableBtn->setEnabled(FALSE);
@@ -557,7 +557,7 @@ void LLPanelOutfitEdit::onSearchEdit(const std::string& string)
 
 }
 
-void LLPanelOutfitEdit::onAddToOutfitClicked(void)
+void LLPanelOutfitEdit::onPlusBtnClicked(void)
 {
 	LLUUID selected_id;
 	if (mInventoryItemsPanel->getVisible())
@@ -577,7 +577,8 @@ void LLPanelOutfitEdit::onAddToOutfitClicked(void)
 
 	if (selected_id.isNull()) return;
 
-	LLAppearanceMgr::getInstance()->wearItemOnAvatar(selected_id);
+	//replacing instead of adding the item
+	LLAppearanceMgr::getInstance()->wearItemOnAvatar(selected_id, true, true);
 }
 
 void LLPanelOutfitEdit::onAddWearableClicked(void)
diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h
index 484f3fcb9f..f449fbca27 100644
--- a/indra/newview/llpaneloutfitedit.h
+++ b/indra/newview/llpaneloutfitedit.h
@@ -146,7 +146,7 @@ public:
 	void onListViewFilterCommitted(LLUICtrl* ctrl);
 	void onSearchEdit(const std::string& string);
 	void onInventorySelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action);
-	void onAddToOutfitClicked(void);
+	void onPlusBtnClicked(void);
 
 	void applyFolderViewFilter(EFolderViewItemType type);
 	void applyListViewFilter(EListViewItemType type);
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 80fbb66ff4..819ba7f878 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -459,7 +459,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
          label=""
          layout="topleft"
          left_pad="1"
-         name="add_to_outfit_btn"
+         name="plus_btn"
          top="1"
          width="31" />
         <icon
-- 
cgit v1.3


From c19dd3d2c48c99f36ff2b6616e7e048ce30d81ad Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Tue, 22 Jun 2010 18:41:40 +0300
Subject: EXT-7805 FIXED set tool_tip for "plus" button when body_part is
 selected in "Add more" panel (Edit Outfit)

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/626/

--HG--
branch : product-engine
---
 indra/newview/llpaneloutfitedit.cpp                | 70 ++++++++++++++--------
 indra/newview/llpaneloutfitedit.h                  |  5 +-
 .../skins/default/xui/en/panel_outfit_edit.xml     |  3 +
 3 files changed, 50 insertions(+), 28 deletions(-)

(limited to 'indra/newview/llpaneloutfitedit.cpp')

diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 6b5eb23a9b..aac020087b 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -252,7 +252,8 @@ LLPanelOutfitEdit::LLPanelOutfitEdit()
 	mInitialized(false),
 	mAddWearablesPanel(NULL),
 	mFolderViewFilterCmbBox(NULL),
-	mListViewFilterCmbBox(NULL)
+	mListViewFilterCmbBox(NULL),
+	mPlusBtn(NULL)
 {
 	mSavedFolderState = new LLSaveFolderState();
 	mSavedFolderState->setApply(FALSE);
@@ -343,9 +344,9 @@ BOOL LLPanelOutfitEdit::postBuild()
 	mInventoryItemsPanel = getChild<LLInventoryPanel>("folder_view");
 	mInventoryItemsPanel->setFilterTypes(ALL_ITEMS_MASK);
 	mInventoryItemsPanel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
-	mInventoryItemsPanel->setSelectCallback(boost::bind(&LLPanelOutfitEdit::onInventorySelectionChange, this, _1, _2));
-	mInventoryItemsPanel->getRootFolder()->setReshapeCallback(boost::bind(&LLPanelOutfitEdit::onInventorySelectionChange, this, _1, _2));
-	
+	mInventoryItemsPanel->setSelectCallback(boost::bind(&LLPanelOutfitEdit::onInventorySelectionChange, this));
+	mInventoryItemsPanel->getRootFolder()->setReshapeCallback(boost::bind(&LLPanelOutfitEdit::onInventorySelectionChange, this));
+
 	mCOFDragAndDropObserver = new LLCOFDragAndDropObserver(mInventoryItemsPanel->getModel());
 
 	mFolderViewFilterCmbBox = getChild<LLComboBox>("folder_view_filter_combobox");
@@ -371,7 +372,8 @@ BOOL LLPanelOutfitEdit::postBuild()
 
 	childSetAction("show_add_wearables_btn", boost::bind(&LLPanelOutfitEdit::onAddMoreButtonClicked, this));
 
-	childSetAction("plus_btn", boost::bind(&LLPanelOutfitEdit::onPlusBtnClicked, this));
+	mPlusBtn = getChild<LLButton>("plus_btn");
+	mPlusBtn->setClickedCallback(boost::bind(&LLPanelOutfitEdit::onPlusBtnClicked, this));
 	
 	mEditWearableBtn = getChild<LLButton>("edit_wearable_btn");
 	mEditWearableBtn->setEnabled(FALSE);
@@ -382,6 +384,8 @@ BOOL LLPanelOutfitEdit::postBuild()
 
 	mWearablesListViewPanel = getChild<LLPanel>("filtered_wearables_panel");
 	mWearableItemsList = getChild<LLInventoryItemsList>("list_view");
+	mWearableItemsList->setCommitOnSelectionChange(true);
+	mWearableItemsList->setCommitCallback(boost::bind(&LLPanelOutfitEdit::onInventorySelectionChange, this));
 
 	mSaveComboBtn.reset(new LLSaveOutfitComboBtn(this));
 	return TRUE;
@@ -559,21 +563,7 @@ void LLPanelOutfitEdit::onSearchEdit(const std::string& string)
 
 void LLPanelOutfitEdit::onPlusBtnClicked(void)
 {
-	LLUUID selected_id;
-	if (mInventoryItemsPanel->getVisible())
-	{
-		LLFolderViewItem* curr_item = mInventoryItemsPanel->getRootFolder()->getCurSelectedItem();
-		if (!curr_item) return;
-
-		LLFolderViewEventListener* listenerp  = curr_item->getListener();
-		if (!listenerp) return;
-
-		selected_id = listenerp->getUUID();
-	}
-	else if (mWearablesListViewPanel->getVisible())
-	{
-		selected_id = mWearableItemsList->getSelectedUUID();
-	}
+	LLUUID selected_id = getSelectedItemUUID();
 
 	if (selected_id.isNull()) return;
 
@@ -658,22 +648,28 @@ void LLPanelOutfitEdit::onEditWearableClicked(void)
 	}
 }
 
-void LLPanelOutfitEdit::onInventorySelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action)
+void LLPanelOutfitEdit::onInventorySelectionChange()
 {
-	LLFolderViewItem* current_item = mInventoryItemsPanel->getRootFolder()->getCurSelectedItem();
-	if (!current_item)
+	LLUUID item_uuid = getSelectedItemUUID();
+	if (item_uuid.isNull())
 	{
 		return;
 	}
 
-	LLViewerInventoryItem* item = current_item->getInventoryItem();
-	if (!item) return;
+	LLViewerInventoryItem* item(gInventory.getItem(item_uuid));
+	if (!item)
+	{
+		return;
+	}
 
 	switch (item->getType())
 	{
-	case LLAssetType::AT_CLOTHING:
 	case LLAssetType::AT_BODYPART:
+		mPlusBtn->setToolTip(getString("replace_body_part"));
+		break;
+	case LLAssetType::AT_CLOTHING:
 	case LLAssetType::AT_OBJECT:
+		mPlusBtn->setToolTip(LLStringUtil::null);
 	default:
 		break;
 	}
@@ -934,4 +930,26 @@ void LLPanelOutfitEdit::onOutfitChanging(bool started)
 	indicator->setVisible(started);
 }
 
+LLUUID LLPanelOutfitEdit::getSelectedItemUUID()
+{
+	LLUUID selected_id;
+	if (mInventoryItemsPanel->getVisible())
+	{
+		LLFolderViewItem* curr_item = mInventoryItemsPanel->getRootFolder()->getCurSelectedItem();
+		if (!curr_item) return selected_id;
+
+		LLFolderViewEventListener* listenerp  = curr_item->getListener();
+		if (!listenerp) return selected_id;
+
+		selected_id = listenerp->getUUID();
+	}
+	else if (mWearablesListViewPanel->getVisible())
+	{
+		selected_id = mWearableItemsList->getSelectedUUID();
+	}
+
+	return selected_id;
+}
+
+
 // EOF
diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h
index f449fbca27..aa5d00903a 100644
--- a/indra/newview/llpaneloutfitedit.h
+++ b/indra/newview/llpaneloutfitedit.h
@@ -145,7 +145,7 @@ public:
 	void onFolderViewFilterCommitted(LLUICtrl* ctrl);
 	void onListViewFilterCommitted(LLUICtrl* ctrl);
 	void onSearchEdit(const std::string& string);
-	void onInventorySelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action);
+	void onInventorySelectionChange();
 	void onPlusBtnClicked(void);
 
 	void applyFolderViewFilter(EFolderViewItemType type);
@@ -192,7 +192,7 @@ private:
 	void onAddMoreButtonClicked();
 	void showFilteredWearablesListView(LLWearableType::EType type);
 	void onOutfitChanging(bool started);
-
+	LLUUID getSelectedItemUUID();
 
 	LLTextBox*			mCurrentOutfitName;
 	LLTextBox*			mStatus;
@@ -203,6 +203,7 @@ private:
 	LLButton*			mEditWearableBtn;
 	LLButton*			mFolderViewBtn;
 	LLButton*			mListViewBtn;
+	LLButton*			mPlusBtn;
 	LLPanel*			mAddWearablesPanel;
 	
 	LLComboBox*			mFolderViewFilterCmbBox;
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 819ba7f878..d6549adfef 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -54,6 +54,9 @@
     <string name="Filter.Clothing" value="Clothing"/>
     <string name="Filter.Bodyparts" value="Body parts"/>
 
+    <string
+     name="replace_body_part"
+     value="Click to replace your existing shape"/>
 
     <button
      follows="top|left"
-- 
cgit v1.3


From bb083dfca471edde7d44f161be2aabca92e72d02 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Wed, 23 Jun 2010 20:53:24 -0400
Subject: EXT-7958 FIX fixed shop button in the appearance sidepanel

updated icon, and fixed XUI so it displays properly.

Code reviewed by Monroe
---
 indra/newview/llpaneloutfitedit.cpp                   |   3 ++-
 indra/newview/skins/default/textures/icons/Shop.png   | Bin 647 -> 3104 bytes
 .../skins/default/xui/en/panel_outfit_edit.xml        |  18 +++++++++++++++---
 3 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'indra/newview/llpaneloutfitedit.cpp')

diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index aac020087b..ea7d233333 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -328,7 +328,8 @@ BOOL LLPanelOutfitEdit::postBuild()
 	childSetCommitCallback("list_view_btn", boost::bind(&LLPanelOutfitEdit::showWearablesListView, this), NULL);
 	childSetCommitCallback("wearables_gear_menu_btn", boost::bind(&LLPanelOutfitEdit::onGearButtonClick, this, _1), NULL);
 	childSetCommitCallback("gear_menu_btn", boost::bind(&LLPanelOutfitEdit::onGearButtonClick, this, _1), NULL);
-	childSetCommitCallback("shop_btn", boost::bind(&LLPanelOutfitEdit::onShopButtonClicked, this), NULL);
+	childSetCommitCallback("shop_btn_1", boost::bind(&LLPanelOutfitEdit::onShopButtonClicked, this), NULL);
+	childSetCommitCallback("shop_btn_2", boost::bind(&LLPanelOutfitEdit::onShopButtonClicked, this), NULL);
 
 	mCOFWearables = getChild<LLCOFWearables>("cof_wearables_list");
 	mCOFWearables->setCommitCallback(boost::bind(&LLPanelOutfitEdit::filterWearablesBySelectedItem, this));
diff --git a/indra/newview/skins/default/textures/icons/Shop.png b/indra/newview/skins/default/textures/icons/Shop.png
index d7e0001dc6..9d091fed44 100644
Binary files a/indra/newview/skins/default/textures/icons/Shop.png and b/indra/newview/skins/default/textures/icons/Shop.png differ
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index d6549adfef..4abd7dceac 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -391,12 +391,12 @@ It is calculated as border_size + 2*UIResizeBarOverlap
          follows="bottom|right"
          height="25"
          image_hover_unselected="Toolbar_Middle_Over"
-         image_overlay="AddItem_Off"
+         image_overlay="Shop"
          image_selected="Toolbar_Middle_Selected"
          image_unselected="Toolbar_Middle_Off"
          layout="topleft"
          left_pad="0"
-         name="shop_btn"
+         name="shop_btn_1"
          top="1"
          width="31" />
     </panel>
@@ -472,8 +472,20 @@ It is calculated as border_size + 2*UIResizeBarOverlap
          layout="topleft"
          left_pad="1"
          name="dummy_right_icon"
-         width="184" >
+         width="153" >
         </icon>
+        <button
+         follows="bottom|right"
+         height="25"
+         image_hover_unselected="Toolbar_Middle_Over"
+         image_overlay="Shop"
+         image_selected="Toolbar_Middle_Selected"
+         image_unselected="Toolbar_Middle_Off"
+         layout="topleft"
+         left_pad="0"
+         name="shop_btn_2"
+         top="1"
+         width="31" />
     </panel>
     
     <!-- SAVE AND REVERT BUTTONS -->
-- 
cgit v1.3


From 3735352328dbc835588b4a7026d2289f6706b5e8 Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Thu, 24 Jun 2010 14:35:34 +0300
Subject: EXT-8008 FIXED Disable (+) button when worn item is selected
 (including multi-selection).

Reviewed by Neal Orman and Mike Antipov at https://codereview.productengine.com/secondlife/r/640/

--HG--
branch : product-engine
---
 indra/newview/llpaneloutfitedit.cpp | 62 ++++++++++++++++++++++++-------------
 indra/newview/llpaneloutfitedit.h   |  3 +-
 2 files changed, 43 insertions(+), 22 deletions(-)

(limited to 'indra/newview/llpaneloutfitedit.cpp')

diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index ea7d233333..54776ca2f7 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -564,7 +564,8 @@ void LLPanelOutfitEdit::onSearchEdit(const std::string& string)
 
 void LLPanelOutfitEdit::onPlusBtnClicked(void)
 {
-	LLUUID selected_id = getSelectedItemUUID();
+	LLUUID selected_id;
+	getCurrentItemUUID(selected_id);
 
 	if (selected_id.isNull()) return;
 
@@ -651,30 +652,31 @@ void LLPanelOutfitEdit::onEditWearableClicked(void)
 
 void LLPanelOutfitEdit::onInventorySelectionChange()
 {
-	LLUUID item_uuid = getSelectedItemUUID();
-	if (item_uuid.isNull())
+	uuid_vec_t selected_items;
+	getSelectedItemsUUID(selected_items);
+	if (selected_items.empty())
 	{
 		return;
 	}
+	uuid_vec_t::iterator worn_item = std::find_if(selected_items.begin(), selected_items.end(), boost::bind(&get_is_item_worn, _1));
+	bool can_add = ( worn_item == selected_items.end() );
 
-	LLViewerInventoryItem* item(gInventory.getItem(item_uuid));
-	if (!item)
-	{
-		return;
-	}
+	mPlusBtn->setEnabled(can_add);
 
-	switch (item->getType())
+	LLViewerInventoryItem* first_item(gInventory.getItem(selected_items.front()));
+
+	if (can_add && 
+		first_item &&
+		selected_items.size() == 1 && 
+		first_item->getType() == LLAssetType::AT_BODYPART)
 	{
-	case LLAssetType::AT_BODYPART:
 		mPlusBtn->setToolTip(getString("replace_body_part"));
-		break;
-	case LLAssetType::AT_CLOTHING:
-	case LLAssetType::AT_OBJECT:
+	}
+	else
+	{
 		mPlusBtn->setToolTip(LLStringUtil::null);
-	default:
-		break;
 	}
-	
+
 	/* Removing add to look inline button (not part of mvp for viewer 2)
 	LLRect btn_rect(current_item->getLocalRect().mRight - 50,
 					current_item->getLocalRect().mTop,
@@ -931,16 +933,15 @@ void LLPanelOutfitEdit::onOutfitChanging(bool started)
 	indicator->setVisible(started);
 }
 
-LLUUID LLPanelOutfitEdit::getSelectedItemUUID()
+void LLPanelOutfitEdit::getCurrentItemUUID(LLUUID& selected_id)
 {
-	LLUUID selected_id;
 	if (mInventoryItemsPanel->getVisible())
 	{
 		LLFolderViewItem* curr_item = mInventoryItemsPanel->getRootFolder()->getCurSelectedItem();
-		if (!curr_item) return selected_id;
+		if (!curr_item) return;
 
 		LLFolderViewEventListener* listenerp  = curr_item->getListener();
-		if (!listenerp) return selected_id;
+		if (!listenerp) return;
 
 		selected_id = listenerp->getUUID();
 	}
@@ -948,8 +949,27 @@ LLUUID LLPanelOutfitEdit::getSelectedItemUUID()
 	{
 		selected_id = mWearableItemsList->getSelectedUUID();
 	}
+}
+
+
+void LLPanelOutfitEdit::getSelectedItemsUUID(uuid_vec_t& uuid_list)
+{
+	if (mInventoryItemsPanel->getVisible())
+	{
+		std::set<LLUUID> item_set = mInventoryItemsPanel->getRootFolder()->getSelectionList();
+
+		std::for_each(item_set.begin(), item_set.end(), boost::bind( &uuid_vec_t::push_back, &uuid_list, _1));
+	}
+	else if (mWearablesListViewPanel->getVisible())
+	{
+		std::vector<LLSD> item_set;
+		mWearableItemsList->getSelectedValues(item_set);
+
+		std::for_each(item_set.begin(), item_set.end(), boost::bind( &uuid_vec_t::push_back, &uuid_list, boost::bind(&LLSD::asUUID, _1 )));
+
+	}
 
-	return selected_id;
+//	return selected_id;
 }
 
 
diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h
index aa5d00903a..de1bf87fb3 100644
--- a/indra/newview/llpaneloutfitedit.h
+++ b/indra/newview/llpaneloutfitedit.h
@@ -192,7 +192,8 @@ private:
 	void onAddMoreButtonClicked();
 	void showFilteredWearablesListView(LLWearableType::EType type);
 	void onOutfitChanging(bool started);
-	LLUUID getSelectedItemUUID();
+	void getSelectedItemsUUID(uuid_vec_t& uuid_list);
+	void getCurrentItemUUID(LLUUID& selected_id);
 
 	LLTextBox*			mCurrentOutfitName;
 	LLTextBox*			mStatus;
-- 
cgit v1.3


From 370ddfb03e5df7d9207c77aec9237dfe192b65dc Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 24 Jun 2010 15:13:30 +0300
Subject: EXT-7963 FIXED Edit Outfit > Add More > Do not switch to next item
 type after add/replace

- Added callback to wear item from Add More panel on doubleclick
- To keep the list in its existing state and do not change the contents of the Add More panel to the next listed unworn item after the user wears an item, check if the item is not dummy. Dummy icons have no ids.

Reviewed by Mike Antipov and Neal Orman at https://codereview.productengine.com/secondlife/r/647/

--HG--
branch : product-engine
---
 indra/newview/llcofwearables.cpp    | 7 ++++++-
 indra/newview/llpaneloutfitedit.cpp | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llpaneloutfitedit.cpp')

diff --git a/indra/newview/llcofwearables.cpp b/indra/newview/llcofwearables.cpp
index 1926682a39..1fab5c7683 100644
--- a/indra/newview/llcofwearables.cpp
+++ b/indra/newview/llcofwearables.cpp
@@ -374,7 +374,12 @@ void LLCOFWearables::refresh()
 				 value_it_end = values.end();
 			 value_it != value_it_end; ++value_it)
 		{
-			list->selectItemByValue(*value_it);
+			// value_it may be null because of dummy items
+			// Dummy items have no ID
+			if(value_it->asUUID().notNull())
+			{
+				list->selectItemByValue(*value_it);
+			}
 		}
 	}
 }
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 54776ca2f7..014b940e00 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -387,6 +387,7 @@ BOOL LLPanelOutfitEdit::postBuild()
 	mWearableItemsList = getChild<LLInventoryItemsList>("list_view");
 	mWearableItemsList->setCommitOnSelectionChange(true);
 	mWearableItemsList->setCommitCallback(boost::bind(&LLPanelOutfitEdit::onInventorySelectionChange, this));
+	mWearableItemsList->setDoubleClickCallback(boost::bind(&LLPanelOutfitEdit::onPlusBtnClicked, this));
 
 	mSaveComboBtn.reset(new LLSaveOutfitComboBtn(this));
 	return TRUE;
-- 
cgit v1.3


From 5a3e16390975b2b8c24b07f52fac89d0d6f3c99b Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@gmail.com>
Date: Thu, 24 Jun 2010 15:19:05 +0300
Subject: EXT-7984 FIXED (state of \"add more\" panel should reset upon closing
 or re-opening outfit editor)

Added code to the LLPanelOutfitEdit::onOpen which resets the state of the \"add more\" panel

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/646

--HG--
branch : product-engine
---
 indra/newview/llpaneloutfitedit.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/llpaneloutfitedit.cpp')

diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 014b940e00..1544717873 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -405,6 +405,10 @@ void LLPanelOutfitEdit::onOpen(const LLSD& key)
 		displayCurrentOutfit();
 		mInitialized = true;
 	}
+
+	showAddWearablesPanel(false);
+	mWearableItemsList->resetSelection();
+	mInventoryItemsPanel->clearSelection();
 }
 
 void LLPanelOutfitEdit::moveWearable(bool closer_to_body)
-- 
cgit v1.3


From 8d18056e8296472d58a820fd77a6a66100e70661 Mon Sep 17 00:00:00 2001
From: Monroe Linden <monroe@lindenlab.com>
Date: Fri, 25 Jun 2010 16:04:45 -0700
Subject: Fix for EXT-8025 ('+' button on My Appearance > Edit Outfit panel
 does nothing)

Button now gets disabled in the early-exit case in LLPanelOutfitEdit::onInventorySelectionChange().

onInventorySelectionChange() also uses the new predicate get_can_item_be_worn(), which both checks whether the item is already being worn and whether it's of a type that could be worn.

Reviewed by Nyx at http://codereview.lindenlab.com/2451030 .
---
 indra/newview/llinventoryfunctions.cpp | 41 ++++++++++++++++++++++++++++++++++
 indra/newview/llinventoryfunctions.h   |  3 +++
 indra/newview/llpaneloutfitedit.cpp    |  7 ++++--
 3 files changed, 49 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llpaneloutfitedit.cpp')

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 37088064c6..7e9a2cb716 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -245,6 +245,47 @@ BOOL get_is_item_worn(const LLUUID& id)
 	return FALSE;
 }
 
+BOOL get_can_item_be_worn(const LLUUID& id)
+{
+	const LLViewerInventoryItem* item = gInventory.getItem(id);
+	if (!item)
+		return FALSE;
+	
+	switch(item->getType())
+	{
+		case LLAssetType::AT_OBJECT:
+		{
+			if (isAgentAvatarValid() && gAgentAvatarp->isWearingAttachment(item->getLinkedUUID()))
+			{
+				// Already being worn
+				return FALSE;
+			}
+			else
+			{
+				// Not being worn yet.
+				return TRUE;
+			}
+			break;
+		}
+		case LLAssetType::AT_BODYPART:
+		case LLAssetType::AT_CLOTHING:
+			if(gAgentWearables.isWearingItem(item->getLinkedUUID()))
+			{
+				// Already being worn
+				return FALSE;
+			}
+			else
+			{
+				// Not being worn yet.
+				return TRUE;
+			}
+			break;
+		default:
+			break;
+	}
+	return FALSE;
+}
+
 BOOL get_is_item_removable(const LLInventoryModel* model, const LLUUID& id)
 {
 	if (!model)
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index 6619a50d28..1c3f82c531 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -46,6 +46,9 @@
 // Is this item or its baseitem is worn, attached, etc...
 BOOL get_is_item_worn(const LLUUID& id);
 
+// Could this item be worn (correct type + not already being worn)
+BOOL get_can_item_be_worn(const LLUUID& id);
+
 BOOL get_is_item_removable(const LLInventoryModel* model, const LLUUID& id);
 
 BOOL get_is_category_removable(const LLInventoryModel* model, const LLUUID& id);
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 1544717873..ffd879dfd7 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -661,10 +661,13 @@ void LLPanelOutfitEdit::onInventorySelectionChange()
 	getSelectedItemsUUID(selected_items);
 	if (selected_items.empty())
 	{
+		mPlusBtn->setEnabled(false);
 		return;
 	}
-	uuid_vec_t::iterator worn_item = std::find_if(selected_items.begin(), selected_items.end(), boost::bind(&get_is_item_worn, _1));
-	bool can_add = ( worn_item == selected_items.end() );
+
+	// If any of the selected items are not wearable (due to already being worn OR being of the wrong type), disable the add button.
+	uuid_vec_t::iterator unwearable_item = std::find_if(selected_items.begin(), selected_items.end(), !boost::bind(& get_can_item_be_worn, _1));
+	bool can_add = ( unwearable_item == selected_items.end() );
 
 	mPlusBtn->setEnabled(can_add);
 
-- 
cgit v1.3


From 41ac3f8f220f32cd36dd61a026d61345a6b9c424 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Fri, 2 Jul 2010 17:33:33 +0300
Subject: EXT-8134 FIXED added filtering wearables depending on expanded outfit
 (panel outfit edit)

Add More is clicked -> list view is shown filtered depending on the expanded tab (if no item is selected), default filtering when nothing is selected and all tabs are collapsed - by clothing

Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/689/

--HG--
branch : product-engine
---
 indra/newview/llpaneloutfitedit.cpp | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

(limited to 'indra/newview/llpaneloutfitedit.cpp')

diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index ffd879dfd7..a7e901cbfa 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -726,24 +726,36 @@ void LLPanelOutfitEdit::filterWearablesBySelectedItem(void)
 	bool more_than_one_selected = ids.size() > 1;
 	bool is_dummy_item = (ids.size() && dynamic_cast<LLPanelDummyClothingListItem*>(mCOFWearables->getSelectedItem()));
 
-	//resetting selection if no item is selected or than one item is selected
-	if (nothing_selected || more_than_one_selected)
+	//expanded accordion tab determines filtering when no item is selected
+	if (nothing_selected)
 	{
-		if (nothing_selected)
-		{
-			showWearablesFolderView();
-			applyFolderViewFilter(FVIT_ALL);
-		}
+		showWearablesListView();
 
-		if (more_than_one_selected)
+		switch (mCOFWearables->getExpandedAccordionAssetType())
 		{
-			showWearablesListView();
-			applyListViewFilter(LVIT_ALL);
+		case LLAssetType::AT_OBJECT:
+			applyListViewFilter(LVIT_ATTACHMENT);
+			break;
+		case LLAssetType::AT_BODYPART:
+			applyListViewFilter(LVIT_BODYPART);
+			break;
+		case LLAssetType::AT_CLOTHING:
+		default: 
+			applyListViewFilter(LVIT_CLOTHING);
+			break;
 		}
 
 		return;
 	}
 
+	//resetting selection if more than one item is selected
+	if (more_than_one_selected)
+	{
+		showWearablesListView();
+		applyListViewFilter(LVIT_ALL);
+		return;
+	}
+
 
 	//filter wearables by a type represented by a dummy item
 	if (one_selected && is_dummy_item)
-- 
cgit v1.3


From 49a3fc9cc3b47a751d99b31f87458680bd966936 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Mon, 5 Jul 2010 12:07:00 +0100
Subject: CID-494

Checker: FORWARD_NULL
Function: LLPanelOutfitEdit::filterWearablesBySelectedItem()
File: /indra/newview/llpaneloutfitedit.cpp
---
 indra/newview/llpaneloutfitedit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llpaneloutfitedit.cpp')

diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index a7e901cbfa..053c2d9498 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -773,7 +773,7 @@ void LLPanelOutfitEdit::filterWearablesBySelectedItem(void)
 		return;
 	}
 
-	if (one_selected && !is_dummy_item)
+	if (item && one_selected && !is_dummy_item)
 	{
 		if (item->isWearableType())
 		{
-- 
cgit v1.3