diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-12-05 10:30:53 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-12-05 10:30:53 -0500 |
| commit | d509e315cfedb1785723184d5f2105af0436eb57 (patch) | |
| tree | 283af77a98ab873533f5c0effa463882ad34a827 | |
| parent | 8892ec5a3bb45eeaf3e66cb9ce884f312bfdfe71 (diff) | |
DRTVWR-447: Fix BugSplat init with non-ASCII chars in install path.
The whole remaining difference between llifstream and std::ifstream is that
the former handles UTF-8 coded pathnames. Microsoft's implementation of the
latter does not.
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 75fa3baa42..fff2653c98 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -600,7 +600,9 @@ bool LLAppViewerWin32::init() std::string build_data_fname( gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "build_data.json")); - std::ifstream inf(build_data_fname.c_str()); + // Use llifstream instead of std::ifstream because LL_PATH_EXECUTABLE + // could contain non-ASCII characters, which std::ifstream doesn't handle. + llifstream inf(build_data_fname.c_str()); if (! inf.is_open()) { LL_WARNS() << "Can't initialize BugSplat, can't read '" << build_data_fname |