XCode now gets cranky about override (or lack there of)

4 files changed, 23 insertions, 23 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);
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 &regionId, 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();