diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-11-03 11:28:08 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-11-03 11:28:08 -0700 |
| commit | 61e6632a713041e8e4ccebf72874767238bf8a48 (patch) | |
| tree | d1134597b1ac03812fccf0ef21171f9577bc522d /indra/newview/llsettingssky.h | |
| parent | 2161788711f6d89564afc933707b6a0b8c1b0562 (diff) | |
Initial day cycle impl.
Diffstat (limited to 'indra/newview/llsettingssky.h')
| -rw-r--r-- | indra/newview/llsettingssky.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llsettingssky.h b/indra/newview/llsettingssky.h index 977ab5141e..ade5a06553 100644 --- a/indra/newview/llsettingssky.h +++ b/indra/newview/llsettingssky.h @@ -56,7 +56,6 @@ public: static const std::string SETTING_MAX_Y; static const std::string SETTING_MOON_ROTATION; static const std::string SETTING_MOON_TEXTUREID; - static const std::string SETTING_NAME; static const std::string SETTING_STAR_BRIGHTNESS; static const std::string SETTING_SUNLIGHT_COLOR; static const std::string SETTING_SUN_ROTATION; @@ -77,7 +76,7 @@ public: virtual std::string getSettingType() const { return std::string("sky"); } // Settings status - ptr_t blend(const ptr_t &other, F32 mix) const; + virtual void blend(const LLSettingsBase::ptr_t &end, F32 blendf); static LLSD defaults(); @@ -414,7 +413,6 @@ public: protected: LLSettingsSky(); - virtual LLSettingsBase::ptr_t blend(const LLSettingsBase::ptr_t &end, F32 blendf) const; virtual stringset_t getSlerpKeys() const; |