diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 14 | 
1 files changed, 7 insertions, 7 deletions
| diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 609f003b1d..64d57d8833 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2989,9 +2989,10 @@ void LLAppViewer::initStrings()      std::string strings_path_full = gDirUtilp->findSkinnedFilenameBaseLang(LLDir::XUI, strings_file);      if (strings_path_full.empty() || !LLFile::isfile(strings_path_full))      { +        std::string crash_reason;          if (strings_path_full.empty())          { -            LL_WARNS() << "The file '" << strings_file << "' is not found" << LL_ENDL; +            crash_reason = "The file '" + strings_file + "' is not found";          }          else          { @@ -2999,24 +3000,23 @@ void LLAppViewer::initStrings()              int rc = LLFile::stat(strings_path_full, &st);              if (rc != 0)              { -                LL_WARNS() << "The file '" << strings_path_full << "' failed to get status. Error code: " << rc << LL_ENDL; +                crash_reason = "The file '" + strings_path_full + "' failed to get status. Error code: " + std::to_string(rc);              }              else if (S_ISDIR(st.st_mode))              { -                LL_WARNS() << "The filename '" << strings_path_full << "' is a directory name" << LL_ENDL; +                crash_reason = "The filename '" + strings_path_full + "' is a directory name";              }              else              { -                LL_WARNS() << "The filename '" << strings_path_full << "' doesn't seem to be a regular file name" << LL_ENDL; +                crash_reason = "The filename '" + strings_path_full + "' doesn't seem to be a regular file name";              }          }          // initial check to make sure files are there failed          gDirUtilp->dumpCurrentDirectories(LLError::LEVEL_WARN);          LLError::LLUserWarningMsg::showMissingFiles(); -        LL_ERRS() << "Viewer failed to find localization and UI files." -            << " Please reinstall viewer from https://secondlife.com/support/downloads" -            << " and contact https://support.secondlife.com if issue persists after reinstall." << LL_ENDL; +        LL_ERRS() << "Viewer failed to open some of localization and UI files." +            << " " << crash_reason << "." << LL_ENDL;      }      LLTransUtil::parseStrings(strings_file, default_trans_args);      LLTransUtil::parseLanguageStrings("language_settings.xml"); | 
