Merge

4 files changed, 4 insertions, 35 deletions

diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index 613ff30c32..3846dfd2a4 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -776,7 +776,7 @@ void LLFloaterEditExtDayCycle::onAddFrame()
         setting = sky;
         mEditDay->setSkyAtKeyframe(sky, frame, mCurrentTrack);
     }
-
+    setDirtyFlag();
     addSliderFrame(frame, setting);
     updateTabs();
 }
@@ -788,6 +788,7 @@ void LLFloaterEditExtDayCycle::onRemoveFrame()
     {
         return;
     }
+    setDirtyFlag();
     removeCurrentSliderFrame();
     updateTabs();
 }
@@ -964,6 +965,7 @@ void LLFloaterEditExtDayCycle::onFrameSliderCallback(const LLSD &data)
                     // reselect new frame
                     mFramesSlider->setCurSlider(it->first);
                     mShiftCopyEnabled = false;
+                    setDirtyFlag();
                 }
             }
             else
@@ -971,6 +973,7 @@ void LLFloaterEditExtDayCycle::onFrameSliderCallback(const LLSD &data)
                 if (mEditDay->moveTrackKeyframe(mCurrentTrack, (*it).second.mFrame, sliderpos) && mCanMod)
                 {
                     (*it).second.mFrame = sliderpos;
+                    setDirtyFlag();
                 }
                 else
                 {
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;
diff --git a/indra/newview/llfloatermyenvironment.h b/indra/newview/llfloatermyenvironment.h
index 10d64eaa93..9472fb63e2 100644
--- a/indra/newview/llfloatermyenvironment.h
+++ b/indra/newview/llfloatermyenvironment.h
@@ -61,10 +61,8 @@ public:
 private:
     LLInventoryPanel *              mInventoryList;
     U64                             mTypeFilter;
-    LLInventoryFilter::EFolderShow  mShowFolders;
     LLUUID                          mSelectedAsset;
 
-    void                            onShowFoldersChange();
     void                            onFilterCheckChange();
     void                            onSelectionChange();
     void                            onDeleteSelected();
diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index c9238b80b3..854ac8b758 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -116,22 +116,6 @@
         </layout_panel>
         <layout_panel
                 auto_resize="false"
-                user_resize="false"
-                tab_group="1"
-                height="14">
-            <check_box
-                    follows="left|bottom"
-                    height="14"
-                    initial_value="false"
-                    label="Show Empty Folders"
-                    layout="topleft"
-                    name="chk_showfolders"
-                    top="2"
-                    left_delta="-1"
-                    width="200" />
-        </layout_panel>
-        <layout_panel
-                auto_resize="false"
                 user_resize="true"
                 tab_group="1"
                 height="31"