Merge

1 files changed, 10 insertions, 6 deletions

diff --git a/indra/newview/llsettingspicker.h b/indra/newview/llsettingspicker.h
index 941fe752b0..859f92fbe8 100644
--- a/indra/newview/llsettingspicker.h
+++ b/indra/newview/llsettingspicker.h
@@ -45,7 +45,12 @@ class LLInventoryPanel;
 class LLFloaterSettingsPicker : public LLFloater
 {
 public:
-    typedef std::function<void (LLUUID id)>                 commit_callback_t;
+    enum ETrackMode
+    {
+        TRACK_NONE,
+        TRACK_WATER,
+        TRACK_SKY
+    };
     typedef std::function<void()>                           close_callback_t;
     typedef std::function<void(const LLUUID& item_id)>     id_changed_callback_t;
 
@@ -66,8 +71,9 @@ public:
     LLSettingsType::type_e  getSettingsFilter() const { return mSettingsType; }
 
     // Only for day cycle
-    void                    setTrackWater(bool use_water) { mTrackWater = use_water; }
-    void                    setTrackSky(bool use_sky) { mTrackWater = !use_sky; }
+    void                    setTrackMode(ETrackMode mode);
+    void                    setTrackWater() { mTrackMode = TRACK_WATER; }
+    void                    setTrackSky() { mTrackMode = TRACK_SKY; }
 
     // Takes a UUID, wraps get/setImageAssetID
     virtual void            setValue(const LLSD& value) override;
@@ -109,7 +115,7 @@ private:
     LLHandle<LLView>        mOwnerHandle;
     LLUUID                  mSettingItemID;
     LLUUID                  mSettingAssetID;
-    bool                    mTrackWater;
+    ETrackMode              mTrackMode;
 
     LLFilterEditor *        mFilterEdit;
     LLInventoryPanel *      mInventoryPanel;
@@ -117,8 +123,6 @@ private:
 
     F32                     mContextConeOpacity;
     PermissionMask          mImmediateFilterPermMask;
-//     PermissionMask          mDnDFilterPermMask;
-//     PermissionMask          mNonImmediateFilterPermMask;
 
     bool                    mActive;
     bool				    mNoCopySettingsSelected;