diff options
| author | Rider Linden <none@none> | 2015-04-13 09:37:09 -0700 |
|---|---|---|
| committer | Rider Linden <none@none> | 2015-04-13 09:37:09 -0700 |
| commit | fe8dec32dbdd6085dd582c49134551638561ca0e (patch) | |
| tree | 8adf11b88185879911fca64825e73b95ff9db972 /indra/llcommon/llstring.cpp | |
| parent | 2d3e4576d7a1f6d5f2a9c0596cefe3f62753b2fa (diff) | |
| parent | 5c6cf3e7fb9f592e3a293921175b64b515bac23f (diff) | |
Merge
Diffstat (limited to 'indra/llcommon/llstring.cpp')
| -rwxr-xr-x | indra/llcommon/llstring.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp index 617969ab2a..f3b8999883 100755 --- a/indra/llcommon/llstring.cpp +++ b/indra/llcommon/llstring.cpp @@ -107,7 +107,7 @@ bool iswindividual(llwchar elem) bool _read_file_into_string(std::string& str, const std::string& filename) { - llifstream ifs(filename, llifstream::binary); + llifstream ifs(filename.c_str(), llifstream::binary); if (!ifs.is_open()) { LL_INFOS() << "Unable to open file " << filename << LL_ENDL; |