diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-02-27 10:46:21 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-02-27 10:46:21 -0800 |
| commit | 87f56754556d9a7a3cf23f35c4ac163447799f98 (patch) | |
| tree | e0eb7055420e2770e02e14d987112a102db9f949 /indra/llinventory/llsettingswater.h | |
| parent | 9f2f2a28740274fa23f1cbcee7dcdefaefb2c469 (diff) | |
XCode now gets cranky about override (or lack there of)
Diffstat (limited to 'indra/llinventory/llsettingswater.h')
| -rw-r--r-- | indra/llinventory/llsettingswater.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llinventory/llsettingswater.h b/indra/llinventory/llsettingswater.h index 16d5b2353a..d4152acfa1 100644 --- a/indra/llinventory/llsettingswater.h +++ b/indra/llinventory/llsettingswater.h @@ -61,7 +61,7 @@ public: virtual LLSettingsType getSettingTypeValue() const override { return LLSettingsType::ST_WATER; } // Settings status - virtual void blend(const LLSettingsBase::ptr_t &end, F64 blendf); + virtual void blend(const LLSettingsBase::ptr_t &end, F64 blendf) override; static LLSD defaults(); @@ -199,7 +199,7 @@ public: return mWaterFogKS; } - virtual validation_list_t getValidationList() const; + virtual validation_list_t getValidationList() const override; static validation_list_t validationList(); static LLSD translateLegacySettings(LLSD legacy); |