diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-06 23:17:02 +0000 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-06 23:17:02 +0000 |
| commit | 15ce532ccf0d1fb387b1b048a2ed7153fad83dc2 (patch) | |
| tree | 4a78afd7409559501a709c30447745215051155c /indra/llinventory/llsettingssky.h | |
| parent | 1687719a2523e1a6a9d8ebc8aeac52c530fa8fd0 (diff) | |
| parent | cbe4cac78cf48cb9144dc2f6c194585cff87a1ce (diff) | |
Merge
Diffstat (limited to 'indra/llinventory/llsettingssky.h')
| -rw-r--r-- | indra/llinventory/llsettingssky.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h index 4884f4f094..d08e2bbd03 100644 --- a/indra/llinventory/llsettingssky.h +++ b/indra/llinventory/llsettingssky.h @@ -90,7 +90,7 @@ public: //--------------------------------------------------------------------- virtual std::string getSettingType() const override { return std::string("sky"); } - virtual LLSettingsType getSettingTypeValue() const override { return LLSettingsType::ST_SKY; } + virtual LLSettingsType::type_e getSettingTypeValue() const override { return LLSettingsType::ST_SKY; } // Settings status @@ -104,7 +104,6 @@ public: } //--------------------------------------------------------------------- -// LEGACY_ATMOSPHERICS LLColor3 getAmbientColor() const { return LLColor3(mSettings[SETTING_AMBIENT]); @@ -433,7 +432,7 @@ public: virtual validation_list_t getValidationList() const override; static validation_list_t validationList(); - static LLSD translateLegacySettings(LLSD legacy); + static LLSD translateLegacySettings(LLSD legacy); protected: static const std::string SETTING_LEGACY_EAST_ANGLE; |