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/newview | |
| parent | 9f2f2a28740274fa23f1cbcee7dcdefaefb2c469 (diff) | |
XCode now gets cranky about override (or lack there of)
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llsettingsvo.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/indra/newview/llsettingsvo.h b/indra/newview/llsettingsvo.h index 55e04b5f3a..7f8dc40c36 100644 --- a/indra/newview/llsettingsvo.h +++ b/indra/newview/llsettingsvo.h @@ -85,17 +85,17 @@ public: static ptr_t buildFromLegacyPreset(const std::string &name, const LLSD &oldsettings); static ptr_t buildDefaultSky(); - virtual ptr_t buildClone(); + virtual ptr_t buildClone() override; static LLSD convertToLegacy(const ptr_t &); protected: LLSettingsVOSky(); - virtual void updateSettings(); + virtual void updateSettings() override; - virtual void applySpecial(void *); + virtual void applySpecial(void *) override; - virtual parammapping_t getParameterMap() const; + virtual parammapping_t getParameterMap() const override; }; @@ -109,16 +109,16 @@ public: static ptr_t buildFromLegacyPreset(const std::string &name, const LLSD &oldsettings); static ptr_t buildDefaultWater(); - virtual ptr_t buildClone(); + virtual ptr_t buildClone() override; static LLSD convertToLegacy(const ptr_t &); protected: LLSettingsVOWater(); - virtual void updateSettings(); - virtual void applySpecial(void *); + virtual void updateSettings() override; + virtual void applySpecial(void *) override; - virtual parammapping_t getParameterMap() const; + virtual parammapping_t getParameterMap() const override; private: @@ -138,16 +138,16 @@ public: static ptr_t buildFromLegacyMessage(const LLUUID ®ionId, LLSD daycycle, LLSD skys, LLSD water); static ptr_t buildDefaultDayCycle(); static ptr_t buildFromEnvironmentMessage(LLSD settings); - virtual ptr_t buildClone(); + virtual ptr_t buildClone() override; static LLSD convertToLegacy(const ptr_t &); - virtual LLSettingsSkyPtr_t getDefaultSky() const; - virtual LLSettingsWaterPtr_t getDefaultWater() const; - virtual LLSettingsSkyPtr_t buildSky(LLSD) const; - virtual LLSettingsWaterPtr_t buildWater(LLSD) const; - virtual LLSettingsSkyPtr_t getNamedSky(const std::string &) const; - virtual LLSettingsWaterPtr_t getNamedWater(const std::string &) const; + virtual LLSettingsSkyPtr_t getDefaultSky() const override; + virtual LLSettingsWaterPtr_t getDefaultWater() const override; + virtual LLSettingsSkyPtr_t buildSky(LLSD) const override; + virtual LLSettingsWaterPtr_t buildWater(LLSD) const override; + virtual LLSettingsSkyPtr_t getNamedSky(const std::string &) const override; + virtual LLSettingsWaterPtr_t getNamedWater(const std::string &) const override; protected: LLSettingsVODay(); |