diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-08-17 12:38:08 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-08-17 12:38:08 -0700 |
| commit | f33d3a40bb361796d0ffcc086eedcb8de204e6ae (patch) | |
| tree | 29493d10b96a96aa103f476431862a9eb33c9606 /indra/newview/llsettingsvo.h | |
| parent | 1716129fd23ff35e030808406af1a8f796dc4b01 (diff) | |
| parent | 597d28ad343d39f0812f7403119cc817dfab3d64 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llsettingsvo.h')
| -rw-r--r-- | indra/newview/llsettingsvo.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llsettingsvo.h b/indra/newview/llsettingsvo.h index 46f91c2264..d314eed24e 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); @@ -158,8 +158,8 @@ public: static ptr_t buildDefaultDayCycle(); static ptr_t buildFromEnvironmentMessage(LLSD settings); static void buildFromOtherSetting(LLSettingsBase::ptr_t settings, asset_built_fn cb); - virtual ptr_t buildClone() override; - virtual ptr_t buildDeepCloneAndUncompress() override; + virtual ptr_t buildClone() const SETTINGS_OVERRIDE; + virtual ptr_t buildDeepCloneAndUncompress() const SETTINGS_OVERRIDE; static LLSD convertToLegacy(const ptr_t &); |