diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-09-23 12:31:47 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-09-23 12:31:47 +0300 |
| commit | 8b410efa4f6eccb689f6adb901ec3eec8cdd8541 (patch) | |
| tree | 2a96652e490db25147586c4bb92275d252f5ffc9 /indra | |
| parent | be233707e1a0a4246be8fabe17419476deec8949 (diff) | |
Revert " SL-13823 FIXED "Settings" are not shown in Inventory filter message"
This reverts commit 0048a4cf18f958591c5e4f9ec829e4ecdc642926.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinventoryfilter.cpp | 12 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 1 |
2 files changed, 0 insertions, 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 <string name="Scripts" value=" Scripts," /> <string name="Sounds" value=" Sounds," /> <string name="Textures" value=" Textures," /> - <string name="Settings" value=" Settings," /> <string name="Snapshots" value=" Snapshots," /> <string name="No Filters" value="No " /> <string name="Since Logoff" value=" - Since Logoff" /> |