Skip to content
Snippets Groups Projects
Commit 5e4a2850 authored by Andrew Polunin's avatar Andrew Polunin
Browse files

EXT-7984 FIXED (onVisibilityChange callback was used instead of onOpen)

Removed code from LLPanelOutfitEdit::onOpen and move it to LLPanelOutfitEdit::onVisibilityChange (as suggested by Nyx Linden at http://jira.secondlife.com/browse/EXT-7984).

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

--HG--
branch : product-engine
parent f92e50c5
No related branches found
No related tags found
No related merge requests found
...@@ -331,6 +331,8 @@ BOOL LLPanelOutfitEdit::postBuild() ...@@ -331,6 +331,8 @@ BOOL LLPanelOutfitEdit::postBuild()
childSetCommitCallback("shop_btn_1", 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); childSetCommitCallback("shop_btn_2", boost::bind(&LLPanelOutfitEdit::onShopButtonClicked, this), NULL);
setVisibleCallback(boost::bind(&LLPanelOutfitEdit::onVisibilityChange, this));
mCOFWearables = getChild<LLCOFWearables>("cof_wearables_list"); mCOFWearables = getChild<LLCOFWearables>("cof_wearables_list");
mCOFWearables->setCommitCallback(boost::bind(&LLPanelOutfitEdit::filterWearablesBySelectedItem, this)); mCOFWearables->setCommitCallback(boost::bind(&LLPanelOutfitEdit::filterWearablesBySelectedItem, this));
...@@ -405,10 +407,6 @@ void LLPanelOutfitEdit::onOpen(const LLSD& key) ...@@ -405,10 +407,6 @@ void LLPanelOutfitEdit::onOpen(const LLSD& key)
displayCurrentOutfit(); displayCurrentOutfit();
mInitialized = true; mInitialized = true;
} }
showAddWearablesPanel(false);
mWearableItemsList->resetSelection();
mInventoryItemsPanel->clearSelection();
} }
void LLPanelOutfitEdit::moveWearable(bool closer_to_body) void LLPanelOutfitEdit::moveWearable(bool closer_to_body)
...@@ -578,6 +576,13 @@ void LLPanelOutfitEdit::onPlusBtnClicked(void) ...@@ -578,6 +576,13 @@ void LLPanelOutfitEdit::onPlusBtnClicked(void)
LLAppearanceMgr::getInstance()->wearItemOnAvatar(selected_id, true, true); LLAppearanceMgr::getInstance()->wearItemOnAvatar(selected_id, true, true);
} }
void LLPanelOutfitEdit::onVisibilityChange()
{
showAddWearablesPanel(false);
mWearableItemsList->resetSelection();
mInventoryItemsPanel->clearSelection();
}
void LLPanelOutfitEdit::onAddWearableClicked(void) void LLPanelOutfitEdit::onAddWearableClicked(void)
{ {
LLPanelDummyClothingListItem* item = dynamic_cast<LLPanelDummyClothingListItem*>(mCOFWearables->getSelectedItem()); LLPanelDummyClothingListItem* item = dynamic_cast<LLPanelDummyClothingListItem*>(mCOFWearables->getSelectedItem());
......
...@@ -148,6 +148,8 @@ class LLPanelOutfitEdit : public LLPanel ...@@ -148,6 +148,8 @@ class LLPanelOutfitEdit : public LLPanel
void onInventorySelectionChange(); void onInventorySelectionChange();
void onPlusBtnClicked(void); void onPlusBtnClicked(void);
void onVisibilityChange();
void applyFolderViewFilter(EFolderViewItemType type); void applyFolderViewFilter(EFolderViewItemType type);
void applyListViewFilter(EListViewItemType type); void applyListViewFilter(EListViewItemType type);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment