From 8b410efa4f6eccb689f6adb901ec3eec8cdd8541 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Wed, 23 Sep 2020 12:31:47 +0300 Subject: Revert " SL-13823 FIXED "Settings" are not shown in Inventory filter message" This reverts commit 0048a4cf18f958591c5e4f9ec829e4ecdc642926. --- indra/newview/llinventoryfilter.cpp | 12 ------------ indra/newview/skins/default/xui/en/strings.xml | 1 - 2 files changed, 13 deletions(-) diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index 8f18de0210..745b953996 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -1230,18 +1230,6 @@ const std::string& LLInventoryFilter::getFilterText() filtered_by_all_types = FALSE; } - if (isFilterObjectTypesWith(LLInventoryType::IT_SETTINGS)) - { - filtered_types += LLTrans::getString("Settings"); - filtered_by_type = TRUE; - num_filter_types++; - } - else - { - not_filtered_types += LLTrans::getString("Settings"); - filtered_by_all_types = FALSE; - } - if (!LLInventoryModelBackgroundFetch::instance().folderFetchActive() && filtered_by_type && !filtered_by_all_types) diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index c9ea423a20..1bfac6aeb7 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2415,7 +2415,6 @@ If you continue to receive this message, please contact Second Life support for - -- cgit v1.2.3