From cf2f0eddeb066d862151154d0d35f7e9f716270b Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Mon, 1 Jun 2020 18:24:52 +0300 Subject: SL-13278 FIXED Creating default clothing not accessible through "Edit My Outfit" for any type that does not already exist --- indra/newview/llpaneloutfitedit.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpaneloutfitedit.cpp') diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index 1d87aa6f5d..dd1130aeba 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -1282,6 +1282,7 @@ void LLPanelOutfitEdit::showFilteredWearablesListView(LLWearableType::EType type //e_list_view_item_type implicitly contains LLWearableType::EType starting from LVIT_SHAPE applyListViewFilter(static_cast(LVIT_SHAPE + type)); + mWearableItemsList->setMenuWearableType(type); } static void update_status_widget_rect(LLView * widget, S32 right_border) -- cgit v1.3 From acce727c1291bca942fc3f79088c4c637fd762e1 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Thu, 19 Nov 2020 20:36:11 +0200 Subject: SL-13278 FIXED Creating default clothing not accessible through "Edit My Outfit" for any type that does not already exist --- 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 dd1130aeba..7c962c296b 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -703,6 +703,10 @@ void LLPanelOutfitEdit::onListViewFilterCommitted(LLUICtrl* ctrl) S32 curr_filter_type = mListViewFilterCmbBox->getCurrentIndex(); if (curr_filter_type < 0) return; + if (curr_filter_type >= LVIT_SHAPE) + { + mWearableItemsList->setMenuWearableType(LLWearableType::EType(curr_filter_type - LVIT_SHAPE)); + } mWearableListManager->setFilterCollector(mListViewItemTypes[curr_filter_type]->collector); } -- cgit v1.3 From 03540e8a394490156c21af5ea18d58f3f43c4164 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 23 Nov 2020 20:41:32 +0200 Subject: SL-14370 Fix loading indicators --- indra/newview/llpaneloutfitedit.cpp | 2 ++ indra/newview/llsidepanelappearance.cpp | 2 ++ indra/newview/llviewerwearable.cpp | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpaneloutfitedit.cpp') diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index 7c962c296b..28a020870f 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -563,6 +563,8 @@ BOOL LLPanelOutfitEdit::postBuild() mGearMenuBtn->setMenu(mGearMenu); mSaveComboBtn.reset(new LLSaveOutfitComboBtn(this)); + + onOutfitChanging(gAgentWearables.isCOFChangeInProgress()); return TRUE; } diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index 6e2b4a00fc..48151c17ea 100644 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -140,6 +140,8 @@ BOOL LLSidepanelAppearance::postBuild() setVisibleCallback(boost::bind(&LLSidepanelAppearance::onVisibilityChanged,this,_2)); + setWearablesLoading(gAgentWearables.isCOFChangeInProgress()); + return TRUE; } diff --git a/indra/newview/llviewerwearable.cpp b/indra/newview/llviewerwearable.cpp index 839e7c5524..9c4dfd1ca2 100644 --- a/indra/newview/llviewerwearable.cpp +++ b/indra/newview/llviewerwearable.cpp @@ -463,7 +463,6 @@ void LLViewerWearable::revertValues() { LLWearable::revertValues(); - LLSidepanelAppearance *panel = dynamic_cast(LLFloaterSidePanelContainer::findPanel("appearance")); if( panel ) { -- cgit v1.3