diff options
author | Rider Linden <rider@lindenlab.com> | 2018-06-01 16:24:36 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-06-01 16:24:36 -0700 |
commit | 2a613d7363c4e91a7258d4f0ea3971db1569e788 (patch) | |
tree | f1882a8e0920bbaf2778d6fcab36df6edc3c3ab7 /indra/llinventory/llsettingsdaycycle.h | |
parent | bd84cbfa11fbe2b3aa5ceba5978841310488b8e4 (diff) |
Rework preset loading and context menu from inventory.
Diffstat (limited to 'indra/llinventory/llsettingsdaycycle.h')
-rw-r--r-- | indra/llinventory/llsettingsdaycycle.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/llinventory/llsettingsdaycycle.h b/indra/llinventory/llsettingsdaycycle.h index 5e6fc7f21d..101cacc3a2 100644 --- a/indra/llinventory/llsettingsdaycycle.h +++ b/indra/llinventory/llsettingsdaycycle.h @@ -60,6 +60,8 @@ public: static const S32 TRACK_MAX; static const S32 FRAME_MAX; + static const LLUUID DEFAULT_ASSET_ID; + typedef std::map<F32, LLSettingsBase::ptr_t> CycleTrack_t; typedef std::vector<CycleTrack_t> CycleList_t; typedef std::shared_ptr<LLSettingsDay> ptr_t; @@ -105,10 +107,7 @@ public: virtual LLSettingsSkyPtr_t buildSky(LLSD) const = 0; virtual LLSettingsWaterPtr_t buildWater(LLSD) const = 0; - virtual LLSettingsSkyPtr_t getNamedSky(const std::string &) const = 0; - virtual LLSettingsWaterPtr_t getNamedWater(const std::string &) const = 0; - - void setInitialized(bool value = true) { mInitialized = value; } + void setInitialized(bool value = true) { mInitialized = value; } CycleTrack_t & getCycleTrack(S32 track); virtual validation_list_t getValidationList() const override; |