diff options
author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-01-28 21:24:11 +0200 |
---|---|---|
committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-01-28 21:24:11 +0200 |
commit | 714df9c4f7c9f24eae1064f45306dea01803ba09 (patch) | |
tree | fe2188af3c5fb88af486c891ce41693925790cac /indra/newview/llsettingspicker.h | |
parent | 54dc80a7091ad2225d8dee610eb50f190a742513 (diff) |
SL-10426 Fixed Inventory day cycle doesn't apply to the parcel from About Land
Diffstat (limited to 'indra/newview/llsettingspicker.h')
-rw-r--r-- | indra/newview/llsettingspicker.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llsettingspicker.h b/indra/newview/llsettingspicker.h index f5aecf4417..859f92fbe8 100644 --- a/indra/newview/llsettingspicker.h +++ b/indra/newview/llsettingspicker.h @@ -45,6 +45,12 @@ class LLInventoryPanel; class LLFloaterSettingsPicker : public LLFloater { public: + 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; @@ -65,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; @@ -108,7 +115,7 @@ private: LLHandle<LLView> mOwnerHandle; LLUUID mSettingItemID; LLUUID mSettingAssetID; - bool mTrackWater; + ETrackMode mTrackMode; LLFilterEditor * mFilterEdit; LLInventoryPanel * mInventoryPanel; |