From 5e4a2850a9bf27cda9c5bad6b702b32b04fbea6f Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@productengine.com>
Date: Tue, 6 Jul 2010 15:22:20 +0300
Subject: [PATCH] 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
---
indra/newview/llpaneloutfitedit.cpp | 13 +++++++++----
indra/newview/llpaneloutfitedit.h | 2 ++
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index a7e901cbfa8..dca2465ebc9 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -331,6 +331,8 @@ BOOL LLPanelOutfitEdit::postBuild()
childSetCommitCallback("shop_btn_1", 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->setCommitCallback(boost::bind(&LLPanelOutfitEdit::filterWearablesBySelectedItem, this));
@@ -405,10 +407,6 @@ void LLPanelOutfitEdit::onOpen(const LLSD& key)
displayCurrentOutfit();
mInitialized = true;
}
-
- showAddWearablesPanel(false);
- mWearableItemsList->resetSelection();
- mInventoryItemsPanel->clearSelection();
}
void LLPanelOutfitEdit::moveWearable(bool closer_to_body)
@@ -578,6 +576,13 @@ void LLPanelOutfitEdit::onPlusBtnClicked(void)
LLAppearanceMgr::getInstance()->wearItemOnAvatar(selected_id, true, true);
}
+void LLPanelOutfitEdit::onVisibilityChange()
+{
+ showAddWearablesPanel(false);
+ mWearableItemsList->resetSelection();
+ mInventoryItemsPanel->clearSelection();
+}
+
void LLPanelOutfitEdit::onAddWearableClicked(void)
{
LLPanelDummyClothingListItem* item = dynamic_cast<LLPanelDummyClothingListItem*>(mCOFWearables->getSelectedItem());
diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h
index de1bf87fb32..fb9a35411c9 100644
--- a/indra/newview/llpaneloutfitedit.h
+++ b/indra/newview/llpaneloutfitedit.h
@@ -148,6 +148,8 @@ class LLPanelOutfitEdit : public LLPanel
void onInventorySelectionChange();
void onPlusBtnClicked(void);
+ void onVisibilityChange();
+
void applyFolderViewFilter(EFolderViewItemType type);
void applyListViewFilter(EListViewItemType type);
--
GitLab