diff options
author | Oz Linden <oz@lindenlab.com> | 2015-04-07 17:28:05 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-04-07 17:28:05 -0400 |
commit | 3a57b18896eacb6fea6680d0eccaaeddb0b700b0 (patch) | |
tree | 70ca4bccbb2fe28ab5232d920a94fd0246f1b8ad /indra/newview/llvoiceclient.cpp | |
parent | 66bc5107863e8226e91818cd9d3c075d0514dbe5 (diff) |
convert llifstream and llofstream to std::ifstream and std::ofstream respectively
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
-rwxr-xr-x | indra/newview/llvoiceclient.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 962cdf0268..e24884fe81 100755 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -1024,10 +1024,15 @@ void LLSpeakerVolumeStorage::load() LLSD settings_llsd; llifstream file; - file.open(filename); + file.open(filename.c_str()); if (file.is_open()) { - LLSDSerialize::fromXML(settings_llsd, file); + if (LLSDParser::PARSE_FAILURE == LLSDSerialize::fromXML(settings_llsd, file)) + { + LL_WARNS("Voice") << "failed to parse " << filename << LL_ENDL; + + } + } for (LLSD::map_const_iterator iter = settings_llsd.beginMap(); @@ -1062,7 +1067,7 @@ void LLSpeakerVolumeStorage::save() } llofstream file; - file.open(filename); + file.open(filename.c_str()); LLSDSerialize::toPrettyXML(settings_llsd, file); } } |