diff options
author | callum_linden <none@none> | 2015-05-18 12:00:36 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2015-05-18 12:00:36 -0700 |
commit | 80aa29eaec78d267b4fa1822cfbd3a33b268066a (patch) | |
tree | 1ce0483bd490750e367bfe53a19ec312cdc0bd27 /indra/newview/llsyntaxid.cpp | |
parent | d214c2854110520d5574f675bcc12f64bfd42090 (diff) | |
parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) |
Merge with Viewer Release (after Viewer Release updated with Viewer Tools Update)
Diffstat (limited to 'indra/newview/llsyntaxid.cpp')
-rw-r--r-- | indra/newview/llsyntaxid.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp index a763d42a8d..802dff1ead 100644 --- a/indra/newview/llsyntaxid.cpp +++ b/indra/newview/llsyntaxid.cpp @@ -83,7 +83,7 @@ public: const std::string xml = str.str(); // save the str to disk, usually to the cache. - llofstream file(mFileSpec, std::ios_base::out); + llofstream file(mFileSpec.c_str(), std::ios_base::out); file.write(xml.c_str(), str.str().size()); file.close(); @@ -269,7 +269,7 @@ void LLSyntaxIdLSL::loadKeywordsIntoLLSD() { LLSD content; llifstream file; - file.open(mFullFileSpec); + file.open(mFullFileSpec.c_str()); if (file.is_open()) { if (LLSDSerialize::fromXML(content, file) != LLSDParser::PARSE_FAILURE) |