From b34bf6d8717ebccd4a3b998f2746fc3067ceef0f Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Tue, 13 Jul 2010 17:04:33 +0300 Subject: EXT-8180 FIXED resetting wearable items list position to top on "Add More" panel opening. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/680/. --HG-- branch : product-engine --- indra/newview/llpaneloutfitedit.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index 31c427d2ba..6935fe03c8 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -442,6 +442,9 @@ void LLPanelOutfitEdit::showAddWearablesPanel(bool show_add_wearables) mListViewFilterCmbBox->setVisible(false); showWearablesFilter(); + + // Reset mWearableItemsList position to top. See EXT-8180. + mWearableItemsList->goToTop(); } //switching button bars @@ -950,9 +953,6 @@ void LLPanelOutfitEdit::showFilteredWearablesListView(LLWearableType::EType type showAddWearablesPanel(true); showWearablesListView(); - // Reset mWearableItemsList position to top. See EXT-8180. - mWearableItemsList->goToTop(); - //e_list_view_item_type implicitly contains LLWearableType::EType starting from LVIT_SHAPE applyListViewFilter((EListViewItemType) (LVIT_SHAPE + type)); } -- cgit v1.2.3 From 962bf7bc41b83faf9e1fa7508a143102dbe1b13f Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Tue, 13 Jul 2010 17:08:35 +0300 Subject: EXT-8328 FIXED passed missing parameter (callback) instead of a default one to the LLAppearanceMgr::addCOFItemLink(...) appearance update callback wasn't passed down to LLAppearanceMgr::addCOFItemLink(...), so wearables list was updated before receiving server response regarding creating of the COF item link Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/741/ --HG-- branch : product-engine --- indra/newview/llappearancemgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 562401cd89..a7d90ab8d3 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -995,7 +995,7 @@ bool LLAppearanceMgr::wearItemOnAvatar(const LLUUID& item_id_to_wear, bool do_up { removeCOFItemLinks(gAgentWearables.getWearableItemID(item_to_wear->getWearableType(), wearable_count-1), false); } - addCOFItemLink(item_to_wear, do_update); + addCOFItemLink(item_to_wear, do_update, cb); } break; case LLAssetType::AT_BODYPART: -- cgit v1.2.3