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 | |
| parent | 9f2f2a28740274fa23f1cbcee7dcdefaefb2c469 (diff) | |
XCode now gets cranky about override (or lack there of)
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingsdaycycle.h | 6 | ||||
| -rw-r--r-- | indra/llinventory/llsettingssky.h | 6 | ||||
| -rw-r--r-- | indra/llinventory/llsettingswater.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/indra/llinventory/llsettingsdaycycle.h b/indra/llinventory/llsettingsdaycycle.h index 7703f7a0b4..ce87e28367 100644 --- a/indra/llinventory/llsettingsdaycycle.h +++ b/indra/llinventory/llsettingsdaycycle.h @@ -71,7 +71,7 @@ public: bool initialize(); virtual ptr_t buildClone() = 0; - virtual LLSD getSettings() const; + virtual LLSD getSettings() const override; virtual LLSettingsType getSettingTypeValue() const override { return LLSettingsType::ST_DAYCYCLE; } @@ -104,13 +104,13 @@ public: void setInitialized(bool value = true) { mInitialized = value; } CycleTrack_t & getCycleTrack(S32 track); - virtual validation_list_t getValidationList() const; + virtual validation_list_t getValidationList() const override; static validation_list_t validationList(); protected: LLSettingsDay(); - virtual void updateSettings(); + virtual void updateSettings() override; bool mInitialized; diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h index 23daf0c5dc..89186cf3a1 100644 --- a/indra/llinventory/llsettingssky.h +++ b/indra/llinventory/llsettingssky.h @@ -77,7 +77,7 @@ public: // 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(); @@ -411,7 +411,7 @@ public: return mTotalAmbient; } - virtual validation_list_t getValidationList() const; + virtual validation_list_t getValidationList() const override; static validation_list_t validationList(); static LLSD translateLegacySettings(LLSD legacy); @@ -425,7 +425,7 @@ protected: virtual stringset_t getSlerpKeys() const; - virtual void updateSettings(); + virtual void updateSettings() override; private: static const F32 NIGHTTIME_ELEVATION; 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); |