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/llsettingsvo.cpp | |
| parent | aba5777d747d67db43e03772d30cb50d18d1a5d5 (diff) | |
| parent | 5621fa48537100d70e8d06b00b6c2577f5c11140 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llsettingsvo.cpp')
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 2 |
1 files changed, 1 insertions, 1 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(); |