From 89f2165b4170d9fddc10a55292c28750093a22a0 Mon Sep 17 00:00:00 2001 From: Alexander Gavriliuk Date: Fri, 25 Aug 2023 22:14:29 +0200 Subject: [PATCH 1/3] SL-20197 Remove 'Edit PBR material' from context menu when editing an attachment --- indra/newview/skins/default/xui/en/menu_attachment_self.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml index 943bfb8122..8e041f8de3 100644 --- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml @@ -17,7 +17,7 @@ name="EditGLTFMaterial"> - Date: Wed, 30 Aug 2023 16:16:26 +0200 Subject: [PATCH 2/3] SL-18366 Crash in LLCullResult::assertDrawMapsEmpty - make the error message more informative --- indra/newview/llspatialpartition.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index c5df09d6e5..29d42b3c00 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -4076,7 +4076,8 @@ void LLCullResult::assertDrawMapsEmpty() { if (mRenderMapSize[i] != 0) { - LL_ERRS() << "Stale LLDrawInfo's in LLCullResult!" << LL_ENDL; + LL_ERRS() << "Stale LLDrawInfo's in LLCullResult!" + << " (mRenderMapSize[" << i << "] = " << mRenderMapSize[i] << ")" << LL_ENDL; } } } From 200696f25c0db21469c64b89799a2dab54d082d9 Mon Sep 17 00:00:00 2001 From: Alexander Gavriliuk Date: Wed, 30 Aug 2023 16:57:36 +0200 Subject: [PATCH 3/3] SL-19664 Crash in LLAppViewer::initStrings - make the error message more informative --- indra/newview/llappviewer.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index a0135fb6e2..ed9bcd9bc6 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2980,7 +2980,10 @@ void LLAppViewer::initStrings() { // initial check to make sure files are there failed gDirUtilp->dumpCurrentDirectories(LLError::LEVEL_WARN); - 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 find localization and UI files" + << " (strings_path_full = '" << strings_path_full << "')." + << " Please reinstall viewer from https://secondlife.com/support/downloads" + << " and contact https://support.secondlife.com if issue persists after reinstall." << LL_ENDL; } LLTransUtil::parseStrings(strings_file, default_trans_args); LLTransUtil::parseLanguageStrings("language_settings.xml");