diff options
| author | Merov Linden <merov@lindenlab.com> | 2015-04-09 16:51:02 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2015-04-09 16:51:02 -0700 |
| commit | 8952e8177528fe0eee65916b9e12c3183f15e392 (patch) | |
| tree | 3625cecb6fd90bf0de23021c22b5d805527af131 /indra/llui/lltextparser.cpp | |
| parent | 47a3aecc97faa6ecb5267dde4274f0fe417e8409 (diff) | |
| parent | 6b9b4c91d122dccabf7541af70ed68a623ad8810 (diff) | |
Merge lindenlab/viewer-tools-update
Diffstat (limited to 'indra/llui/lltextparser.cpp')
| -rwxr-xr-x | indra/llui/lltextparser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lltextparser.cpp b/indra/llui/lltextparser.cpp index 0b36241da0..086d937753 100755 --- a/indra/llui/lltextparser.cpp +++ b/indra/llui/lltextparser.cpp @@ -211,7 +211,7 @@ void LLTextParser::loadKeywords() std::string filename=getFileName(); if (!filename.empty()) { - llifstream file; + std::ifstream file; file.open(filename.c_str()); if (file.is_open()) { @@ -231,7 +231,7 @@ bool LLTextParser::saveToDisk(LLSD highlights) LL_WARNS() << "LLTextParser::saveToDisk() no valid user directory." << LL_ENDL; return FALSE; } - llofstream file; + std::ofstream file; file.open(filename.c_str()); LLSDSerialize::toPrettyXML(mHighlights, file); file.close(); |