diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-01-08 15:10:25 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-01-08 15:10:25 -0800 |
| commit | 8211f57205f0008d8ffb9bfcd465ca26d906e19c (patch) | |
| tree | d5ab9820e70d6828220841141abad38c548759ba /indra/llinventory/llsettingssky.h | |
| parent | 1df10afa2a7802763330475e1a90547c3cff7c06 (diff) | |
MAINT-7699: Deliver new settings to viewer via cap
Diffstat (limited to 'indra/llinventory/llsettingssky.h')
| -rw-r--r-- | indra/llinventory/llsettingssky.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h index ff4b62f86e..12ea237ef3 100644 --- a/indra/llinventory/llsettingssky.h +++ b/indra/llinventory/llsettingssky.h @@ -75,7 +75,7 @@ public: virtual std::string getSettingType() const { return std::string("sky"); } // Settings status - virtual void blend(const LLSettingsBase::ptr_t &end, F32 blendf); + virtual void blend(const LLSettingsBase::ptr_t &end, F64 blendf); static LLSD defaults(); @@ -410,6 +410,10 @@ public: } protected: + static const std::string SETTING_LEGACY_EAST_ANGLE; + static const std::string SETTING_LEGACY_ENABLE_CLOUD_SCROLL; + static const std::string SETTING_LEGACY_SUN_ANGLE; + LLSettingsSky(); virtual stringset_t getSlerpKeys() const; @@ -421,10 +425,6 @@ protected: static LLSD translateLegacySettings(LLSD legacy); private: - static const std::string SETTING_LEGACY_EAST_ANGLE; - static const std::string SETTING_LEGACY_ENABLE_CLOUD_SCROLL; - static const std::string SETTING_LEGACY_SUN_ANGLE; - static const F32 NIGHTTIME_ELEVATION; static const F32 NIGHTTIME_ELEVATION_COS; |