diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-04-10 11:02:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-04-10 11:02:37 -0400 |
| commit | 5c6cf3e7fb9f592e3a293921175b64b515bac23f (patch) | |
| tree | 15933c1910c4b337e0c181434b6d653628f62eed /indra/newview/llfloaterabout.cpp | |
| parent | 6b9b4c91d122dccabf7541af70ed68a623ad8810 (diff) | |
restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes
Diffstat (limited to 'indra/newview/llfloaterabout.cpp')
| -rwxr-xr-x | indra/newview/llfloaterabout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 5529111b7f..b342d8fdf3 100755 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -154,7 +154,7 @@ BOOL LLFloaterAbout::postBuild() // Get the names of contributors, extracted from .../doc/contributions.txt by viewer_manifest.py at build time std::string contributors_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"contributors.txt"); - std::ifstream contrib_file; + llifstream contrib_file; std::string contributors; contrib_file.open(contributors_path.c_str()); /* Flawfinder: ignore */ if (contrib_file.is_open()) @@ -172,7 +172,7 @@ BOOL LLFloaterAbout::postBuild() // Get the Versions and Copyrights, created at build time std::string licenses_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"packages-info.txt"); - std::ifstream licenses_file; + llifstream licenses_file; licenses_file.open(licenses_path.c_str()); /* Flawfinder: ignore */ if (licenses_file.is_open()) { |