From 87f56754556d9a7a3cf23f35c4ac163447799f98 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Tue, 27 Feb 2018 10:46:21 -0800 Subject: XCode now gets cranky about override (or lack there of) --- indra/llinventory/llsettingsdaycycle.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llinventory/llsettingsdaycycle.h') 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; -- cgit v1.2.3 From edc12edaae2333810161fadc787920b252e5fec1 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Tue, 27 Feb 2018 11:02:37 -0800 Subject: Missed two overrides. --- indra/llinventory/llsettingsdaycycle.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llinventory/llsettingsdaycycle.h') diff --git a/indra/llinventory/llsettingsdaycycle.h b/indra/llinventory/llsettingsdaycycle.h index ce87e28367..2d0fa4a840 100644 --- a/indra/llinventory/llsettingsdaycycle.h +++ b/indra/llinventory/llsettingsdaycycle.h @@ -76,10 +76,10 @@ public: //--------------------------------------------------------------------- - virtual std::string getSettingType() const { return std::string("daycycle"); } + virtual std::string getSettingType() const override { return std::string("daycycle"); } // Settings status - virtual void blend(const LLSettingsBase::ptr_t &other, F64 mix); + virtual void blend(const LLSettingsBase::ptr_t &other, F64 mix) override; static LLSD defaults(); -- cgit v1.2.3