Make settings vfuncs use SETTINGS_OVERRIDE macro (override keyword in viewer codebase) to fix OS X compilation.

Mark cloning funcs and derived class overrides as const.

2 files changed, 8 insertions, 8 deletions

diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index b9eb1fd5c6..c410f0d955 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -485,7 +485,7 @@ LLSettingsSky::ptr_t LLSettingsVOSky::buildDefaultSky()
     return skyp;
 }
 
-LLSettingsSky::ptr_t LLSettingsVOSky::buildClone()
+LLSettingsSky::ptr_t LLSettingsVOSky::buildClone() const
 {
     LLSD settings = cloneSettings();
 
@@ -736,7 +736,7 @@ LLSettingsWater::ptr_t LLSettingsVOWater::buildDefaultWater()
     return waterp;
 }
 
-LLSettingsWater::ptr_t LLSettingsVOWater::buildClone()
+LLSettingsWater::ptr_t LLSettingsVOWater::buildClone() const
 {
     LLSD settings = cloneSettings();
     LLSettingsWater::validation_list_t validations = LLSettingsWater::validationList();
@@ -1074,7 +1074,7 @@ LLSettingsDay::ptr_t LLSettingsVODay::buildFromEnvironmentMessage(LLSD settings)
 }
 
 
-LLSettingsDay::ptr_t LLSettingsVODay::buildClone()
+LLSettingsDay::ptr_t LLSettingsVODay::buildClone() const
 {
     LLSD settings = cloneSettings();
 
@@ -1092,7 +1092,7 @@ LLSettingsDay::ptr_t LLSettingsVODay::buildClone()
     return dayp;
 }
 
-LLSettingsDay::ptr_t LLSettingsVODay::buildDeepCloneAndUncompress()
+LLSettingsDay::ptr_t LLSettingsVODay::buildDeepCloneAndUncompress() const
 {
     // no need for SETTING_TRACKS or SETTING_FRAMES, so take base LLSD
     LLSD settings = llsd_clone(mSettings);
diff --git a/indra/newview/llsettingsvo.h b/indra/newview/llsettingsvo.h
index fedb758b48..5431a5d027 100644
--- a/indra/newview/llsettingsvo.h
+++ b/indra/newview/llsettingsvo.h
@@ -89,7 +89,7 @@ public:
 
     static ptr_t    buildFromLegacyPreset(const std::string &name, const LLSD &oldsettings);
     static ptr_t    buildDefaultSky();
-    virtual ptr_t   buildClone() override;
+    virtual ptr_t   buildClone() const SETTINGS_OVERRIDE;
 
     static ptr_t    buildFromLegacyPresetFile(const std::string &name, const std::string &path);
 
@@ -123,7 +123,7 @@ public:
 
     static ptr_t    buildFromLegacyPreset(const std::string &name, const LLSD &oldsettings);
     static ptr_t    buildDefaultWater();
-    virtual ptr_t   buildClone() override;
+    virtual ptr_t   buildClone() const SETTINGS_OVERRIDE;
 
     static ptr_t    buildFromLegacyPresetFile(const std::string &name, const std::string &path);
 
@@ -155,8 +155,8 @@ 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() override;
-    virtual ptr_t   buildDeepCloneAndUncompress();
+    virtual ptr_t   buildClone() const SETTINGS_OVERRIDE;
+    virtual ptr_t   buildDeepCloneAndUncompress() const SETTINGS_OVERRIDE;
 
     static LLSD     convertToLegacy(const ptr_t &);