diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-02-28 21:57:19 +0000 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-02-28 21:57:19 +0000 |
| commit | ccdf55f4abdbe4ef0944f8c28216d78e259e3cf0 (patch) | |
| tree | 67276eddc55fd54ab4e523716d0b7033ab9cbfad /indra/newview | |
| parent | aba5777d747d67db43e03772d30cb50d18d1a5d5 (diff) | |
| parent | 5621fa48537100d70e8d06b00b6c2577f5c11140 (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llsettingsvo.h | 30 |
2 files changed, 16 insertions, 16 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 4a7c22c166..861615b14b 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -305,7 +305,7 @@ LLSettingsBase::ptr_t LLSettingsVOBase::importFile(const std::string &filename) catch (const std::ios_base::failure &e) { LL_WARNS("SETTINGS") << "Unable to save settings to file '" << filename << "': " << e.what() << LL_ENDL; - return false; + return LLSettingsBase::ptr_t(); } std::string settingtype = settings[SETTING_NAME].asString(); 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(); |