diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-27 00:33:40 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-27 00:33:40 +0200 |
| commit | 1ae6f5dd6f351acbc3a3d90085730d97544c90ce (patch) | |
| tree | 63e13c9b67967e50f248e3c9cc001cd9985ddc74 /indra/llui | |
| parent | 6e9cccedb504bfa325b0fa30088d69db1ee80dc8 (diff) | |
| parent | 9567393f803dfb0c786b8e917e41c8f4b8b22af7 (diff) | |
Merge branch 'main' into DRTVWR-591-maint-X
# Conflicts:
# indra/llui/lltransutil.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterenvironmentadjust.cpp
# indra/newview/llpaneleditwater.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lltransutil.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltransutil.cpp b/indra/llui/lltransutil.cpp index 06760c4196..6c486f29ba 100644 --- a/indra/llui/lltransutil.cpp +++ b/indra/llui/lltransutil.cpp @@ -44,12 +44,12 @@ bool LLTransUtil::parseStrings(const std::string& xml_filename, const std::set<s bool success = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root, LLDir::ALL_SKINS); if (!success) { - //gDirUtilp->dumpCurrentDirectories(LLError::LEVEL_WARN); const std::string error_string = "Second Life viewer couldn't access some of the files it needs and will be closed." "\n\nPlease reinstall viewer from https://secondlife.com/support/downloads/ and " "contact https://support.secondlife.com if issue persists after reinstall."; LLError::LLUserWarningMsg::show(error_string); + gDirUtilp->dumpCurrentDirectories(LLError::LEVEL_WARN); LL_ERRS() << "Couldn't load string table " << xml_filename << " " << errno << LL_ENDL; return false; } |