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/llimage/llimage.cpp | |
| parent | 2d3e4576d7a1f6d5f2a9c0596cefe3f62753b2fa (diff) | |
| parent | 5c6cf3e7fb9f592e3a293921175b64b515bac23f (diff) | |
Merge
Diffstat (limited to 'indra/llimage/llimage.cpp')
| -rwxr-xr-x | indra/llimage/llimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index ecdcd95d29..16df27bb8e 100755 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -1172,7 +1172,7 @@ static std::string find_file(std::string &name, S8 *codec) for (int i=0; i<(int)(NUM_FILE_EXTENSIONS); i++) { tname = name + "." + std::string(file_extensions[i].exten); - llifstream ifs(tname, llifstream::binary); + llifstream ifs(tname.c_str(), llifstream::binary); if (ifs.is_open()) { ifs.close(); @@ -1219,7 +1219,7 @@ bool LLImageRaw::createFromFile(const std::string &filename, bool j2c_lowest_mip return false; // format not recognized } - llifstream ifs(name, llifstream::binary); + llifstream ifs(name.c_str(), llifstream::binary); if (!ifs.is_open()) { // SJB: changed from LL_INFOS() to LL_DEBUGS() to reduce spam |