diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-11 17:59:19 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-11 17:59:19 +0100 |
| commit | 4fbdfe637049e0a2e93c6fed030e61b32a43ae07 (patch) | |
| tree | e502796c9f39a790f8004edfba5383b1ac7617a2 /indra/llinventory/llsettingssky.h | |
| parent | a0598b12656cdcf22ba95cacd01b5ff36f8f1b26 (diff) | |
| parent | 8365945f8af6e27e7180b40aae79f210f99bb7c8 (diff) | |
Merge
Diffstat (limited to 'indra/llinventory/llsettingssky.h')
| -rw-r--r-- | indra/llinventory/llsettingssky.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h index 0cdd064624..c30efe0781 100644 --- a/indra/llinventory/llsettingssky.h +++ b/indra/llinventory/llsettingssky.h @@ -97,8 +97,8 @@ public: virtual ptr_t buildClone() = 0; //--------------------------------------------------------------------- - virtual std::string getSettingType() const SETTINGS_OVERRIDE { return std::string("sky"); } - virtual LLSettingsType::type_e getSettingTypeValue() const SETTINGS_OVERRIDE { return LLSettingsType::ST_SKY; } + virtual std::string getSettingsType() const SETTINGS_OVERRIDE { return std::string("sky"); } + virtual LLSettingsType::type_e getSettingsTypeValue() const SETTINGS_OVERRIDE { return LLSettingsType::ST_SKY; } // Settings status virtual void blend(const LLSettingsBase::ptr_t &end, F64 blendf) SETTINGS_OVERRIDE; |