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.

1 files changed, 4 insertions, 4 deletions

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 &);