1 files changed, 0 insertions, 16 deletions
diff --git a/indra/newview/llfloatermyenvironment.cpp b/indra/newview/llfloatermyenvironment.cpp
index 1edec248d9..3a83042d4f 100644
--- a/indra/newview/llfloatermyenvironment.cpp
+++ b/indra/newview/llfloatermyenvironment.cpp
@@ -58,7 +58,6 @@ namespace
     const std::string CHECK_SKIES("chk_skies");
     const std::string CHECK_WATER("chk_water");
     const std::string PANEL_SETTINGS("pnl_settings");
-    const std::string CHECK_SHOWFOLDERS("chk_showfolders");
     const std::string BUTTON_NEWSETTINGS("btn_gear");
     const std::string BUTTON_GEAR("btn_newsettings");
     const std::string BUTTON_DELETE("btn_del");
@@ -152,7 +151,6 @@ public:
 LLFloaterMyEnvironment::LLFloaterMyEnvironment(const LLSD& key) :
     LLFloater(key),
     mInventoryList(nullptr),
-    mShowFolders(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS),
     mTypeFilter((0x01 << static_cast<U64>(LLSettingsType::ST_DAYCYCLE)) | (0x01 << static_cast<U64>(LLSettingsType::ST_SKY)) | (0x01 << static_cast<U64>(LLSettingsType::ST_WATER))),
     mSelectedAsset()
 {
@@ -188,14 +186,12 @@ BOOL LLFloaterMyEnvironment::postBuild()
         mInventoryList->setFilterTypes(filter_types);
 
         mInventoryList->setSelectCallback([this](const std::deque<LLFolderViewItem*>&, BOOL) { onSelectionChange(); });
-        mInventoryList->setShowFolderState(mShowFolders);
         mInventoryList->setFilterSettingsTypes(mTypeFilter);
     }
 
     childSetCommitCallback(CHECK_DAYS, [this](LLUICtrl*, void*) { onFilterCheckChange(); }, nullptr);
     childSetCommitCallback(CHECK_SKIES, [this](LLUICtrl*, void*) { onFilterCheckChange(); }, nullptr);
     childSetCommitCallback(CHECK_WATER, [this](LLUICtrl*, void*) { onFilterCheckChange(); }, nullptr);
-    childSetCommitCallback(CHECK_SHOWFOLDERS, [this](LLUICtrl*, void*) { onShowFoldersChange(); }, nullptr);
 
     childSetCommitCallback(BUTTON_DELETE, [this](LLUICtrl *, void*) { onDeleteSelected(); }, nullptr);
 
@@ -204,8 +200,6 @@ BOOL LLFloaterMyEnvironment::postBuild()
 
 void LLFloaterMyEnvironment::refresh()
 {
-    getChild<LLCheckBoxCtrl>(CHECK_SHOWFOLDERS)->setValue(LLSD::Boolean(mShowFolders == LLInventoryFilter::SHOW_ALL_FOLDERS));
-
     getChild<LLCheckBoxCtrl>(CHECK_DAYS)->setValue(LLSD::Boolean(mTypeFilter & (0x01 << static_cast<U64>(LLSettingsType::ST_DAYCYCLE))));
     getChild<LLCheckBoxCtrl>(CHECK_SKIES)->setValue(LLSD::Boolean(mTypeFilter & (0x01 << static_cast<U64>(LLSettingsType::ST_SKY))));
     getChild<LLCheckBoxCtrl>(CHECK_WATER)->setValue(LLSD::Boolean(mTypeFilter & (0x01 << static_cast<U64>(LLSettingsType::ST_WATER))));
@@ -238,16 +232,6 @@ void LLFloaterMyEnvironment::onOpen(const LLSD& key)
 }
 
 //-------------------------------------------------------------------------
-void LLFloaterMyEnvironment::onShowFoldersChange()
-{
-    bool show_check (getChild<LLCheckBoxCtrl>(CHECK_SHOWFOLDERS)->getValue().asBoolean());
-
-    mShowFolders = (show_check) ? LLInventoryFilter::SHOW_ALL_FOLDERS : LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS;
-
-    if (mInventoryList)
-        mInventoryList->setShowFolderState(mShowFolders);
-}
-
 void LLFloaterMyEnvironment::onFilterCheckChange()
 {
     mTypeFilter = 0x0;