diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-01 15:34:21 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-01 15:34:21 +0100 |
| commit | 37e8fd20c3823482f3a15b4bfd544f7847070db8 (patch) | |
| tree | b31e3a1ef86431cda7703621f779b38a98c14a3e /indra/llinventory/llsettingswater.h | |
| parent | 64302d3000b69b31e72eb6a3bd8a981c80cb88de (diff) | |
| parent | bd84cbfa11fbe2b3aa5ceba5978841310488b8e4 (diff) | |
Merge to 5.1.6
Diffstat (limited to 'indra/llinventory/llsettingswater.h')
| -rw-r--r-- | indra/llinventory/llsettingswater.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/llinventory/llsettingswater.h b/indra/llinventory/llsettingswater.h index 642f86a9d6..acae903e92 100644 --- a/indra/llinventory/llsettingswater.h +++ b/indra/llinventory/llsettingswater.h @@ -76,22 +76,22 @@ public: setValue(SETTING_BLUR_MULTIPILER, val); } - LLColor3 getWaterFogColor() const + LLColor3 getFogColor() const { return LLColor3(mSettings[SETTING_FOG_COLOR]); } - void setWaterFogColor(LLColor3 val) + void setFogColor(LLColor3 val) { setValue(SETTING_FOG_COLOR, val); } - F32 getWaterFogDensity() const + F32 getFogDensity() const { return mSettings[SETTING_FOG_DENSITY].asReal(); } - void setWaterFogDensity(F32 val) + void setFogDensity(F32 val) { setValue(SETTING_FOG_DENSITY, val); } @@ -211,6 +211,8 @@ public: static LLSD translateLegacySettings(LLSD legacy); + virtual LLSettingsBase::ptr_t buildDerivedClone() override { return buildClone(); } + protected: static const std::string SETTING_LEGACY_BLUR_MULTIPILER; static const std::string SETTING_LEGACY_FOG_COLOR; |