diff options
author | Bjoseph Wombat <bjoseph@vivox.com> | 2015-05-11 14:57:57 +0100 |
---|---|---|
committer | Bjoseph Wombat <bjoseph@vivox.com> | 2015-05-11 14:57:57 +0100 |
commit | c6650c13306b0d049ecba02710645b9ca2d90c05 (patch) | |
tree | 54932d9221df41ec9c608b70eeb5379fcb1d72c3 /indra/llxml/llcontrol.cpp | |
parent | 7ec58ee04789a8cc819d1151529d843045651bc8 (diff) | |
parent | e611e35e033e99f619b0e4938f6879c8e387efd5 (diff) |
updates from bitbucket repository
Diffstat (limited to 'indra/llxml/llcontrol.cpp')
-rwxr-xr-x | indra/llxml/llcontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp index 598a802d67..4e3d0ab392 100755 --- a/indra/llxml/llcontrol.cpp +++ b/indra/llxml/llcontrol.cpp @@ -833,7 +833,7 @@ U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only } } llofstream file; - file.open(filename); + file.open(filename.c_str()); if (file.is_open()) { LLSDSerialize::toPrettyXML(settings, file); @@ -853,7 +853,7 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v { LLSD settings; llifstream infile; - infile.open(filename); + infile.open(filename.c_str()); if(!infile.is_open()) { LL_WARNS("Settings") << "Cannot find file " << filename << " to load." << LL_ENDL; |