From 5002c9caf4b9123fe1f9fa9be9575f7f946db371 Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 15 Jul 2021 22:38:40 +0200 Subject: [PATCH 1/9] Make the configure script smarter by automatically setting up bugsplat in case crashreporting is desire (and a channel is set). --- scripts/configure_firestorm.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh index 4ba88357f3..249d7d905b 100755 --- a/scripts/configure_firestorm.sh +++ b/scripts/configure_firestorm.sh @@ -364,6 +364,7 @@ else fi +CHANNEL_SIMPLE="$CHANNEL" if [ -z $CHANNEL ] ; then if [ $TARGET_PLATFORM == "darwin" ] ; then CHANNEL="private-`hostname -s` " @@ -503,7 +504,11 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then else VIEWER_SYMBOL_FILE="${BUILD_DIR}/newview/$BTYPE/firestorm-symbols-${TARGET_PLATFORM}-${AUTOBUILD_ADDRSIZE}.tar.bz2" fi - CRASH_REPORTING="-DRELEASE_CRASH_REPORTING:BOOL=ON" + CRASH_REPORTING="-DRELEASE_CRASH_REPORTING=ON" + if [ ! -z $CHANNEL_SIMPLE ] + then + CRASH_REPORTING="$CRASH_REPORTING -DUSE_BUGSPLAT=On -DBUGSPLAT_DB=firestorm_"`echo $CHANNEL_SIMPLE | tr [:upper:] [:lower:]` + fi else CRASH_REPORTING="-DRELEASE_CRASH_REPORTING:BOOL=OFF" fi From 238ce718a636e7a6097df85eceecb0e458c58a0d Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Thu, 15 Jul 2021 22:28:06 -0500 Subject: [PATCH 2/9] FIRE-31062: Rebuild KDU for macOS to allow running on older versions. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 79ca1cb0f8..fdbc511564 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1932,9 +1932,9 @@ archive hash - 8d0ad384de8fbbc9083cac20258fcb0c + 3b8b0f54c851f136e2a92e1c6ba724a5 url - file:///opt/firestorm/kdu-8.1-darwin64-210931415.tar.bz2 + file:///opt/firestorm/kdu-8.1-darwin64-211970151.tar.bz2 name darwin64 From cb8df37e9123ab48fb72a7d2f2a816e3e392e85b Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Fri, 16 Jul 2021 21:46:23 +0200 Subject: [PATCH 3/9] FIRE-31068 New Guidebook UI adjustments Synchronized llfloaterwebcontent.cpp with the Lab's one around the lines where QAMode was checked; It's always possible to just load the test URL manually anyway --- indra/newview/llfloaterwebcontent.cpp | 3 --- indra/newview/skins/default/xui/en/floater_how_to.xml | 2 +- indra/newview/skins/default/xui/en/strings.xml | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp index 3d885720b7..9615147637 100644 --- a/indra/newview/llfloaterwebcontent.cpp +++ b/indra/newview/llfloaterwebcontent.cpp @@ -117,9 +117,6 @@ BOOL LLFloaterWebContent::postBuild() // initialize the URL history using the system URL History manager initializeURLHistory(); - // if "Develop" Menu open, sety a flag and change things to be more useful for devs - mDevelopMode = gSavedSettings.getBOOL("QAMode"); - return TRUE; } diff --git a/indra/newview/skins/default/xui/en/floater_how_to.xml b/indra/newview/skins/default/xui/en/floater_how_to.xml index 8eec5a271a..9377724134 100644 --- a/indra/newview/skins/default/xui/en/floater_how_to.xml +++ b/indra/newview/skins/default/xui/en/floater_how_to.xml @@ -10,7 +10,7 @@ single_instance="true" save_visibility="true" save_rect="true" - title="How to" + title="Welcome Island Guidebook" width="310" rel_x="-0.469309" rel_y="-0.011166" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index fac6ec4b43..652472923c 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2657,7 +2657,7 @@ Try enclosing path to the editor with double quotes. Flickr Gestures Grid status - How to + Guidebook Inventory Map Marketplace From 775adeb64762184bbed3125151687f7be7f80cda Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Sat, 17 Jul 2021 19:23:45 -0500 Subject: [PATCH 4/9] FIRE-31070: Crash on clearing cache on macOS and Linux. --- indra/llfilesystem/lldiskcache.cpp | 31 +++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/indra/llfilesystem/lldiskcache.cpp b/indra/llfilesystem/lldiskcache.cpp index aa4e07a583..e126a24c00 100644 --- a/indra/llfilesystem/lldiskcache.cpp +++ b/indra/llfilesystem/lldiskcache.cpp @@ -414,26 +414,47 @@ void LLDiskCache::clearCache() #endif if (boost::filesystem::is_directory(cache_path, ec) && !ec.failed()) { + LL_INFOS() << "is a directory: " << mCacheDir << LL_ENDL; // Optimize asset simple disk cache //for (auto& entry : boost::make_iterator_range(boost::filesystem::directory_iterator(cache_path, ec), {})) - for (auto& entry : boost::make_iterator_range(boost::filesystem::recursive_directory_iterator(cache_path, ec), {})) + // FIRE-31070: Crash on clearing cache on macOS and Linux + // On Unix-like operating systems, the recursive_directory_iterator gets very unhappy if you + // delete a file out from under it in a for loop. This restructuring to a while loop and + // manually incrementing the iterator avoids the problem. Note that the iterator must be + // incremented *before* deleting the file. + boost::filesystem::recursive_directory_iterator entry(cache_path, ec); + boost::filesystem::recursive_directory_iterator cache_end; + while (entry != cache_end) { - if (boost::filesystem::is_regular_file(entry, ec) && !ec.failed()) + const boost::filesystem::path& remove_entry = entry->path(); + if (boost::filesystem::is_regular_file(remove_entry, ec) && !ec.failed()) { - if (entry.path().string().find(mCacheFilenamePrefix) != std::string::npos) + if (remove_entry.string().find(mCacheFilenamePrefix) != std::string::npos) { // Do not crash if we cannot delete the file for some reason //boost::filesystem::remove(entry); - boost::filesystem::remove(entry, ec); + const boost::filesystem::path remove_path = remove_entry; + ++entry; + boost::filesystem::remove(remove_path, ec); if (ec.failed()) { - LL_WARNS() << "Failed to delete cache file " << entry << ": " << ec.message() << LL_ENDL; + LL_WARNS() << "Failed to delete cache file " << remove_path.string() << ": " << ec.message() << LL_ENDL; } // } + else + { + ++entry; + } } + else + { + ++entry; + } + // FIRE-31070 } // add static assets into the new cache after clear + LL_INFOS() << "prepopulating new cache " << LL_ENDL; prepopulateCacheWithStatic(); } LL_INFOS() << "Cleared cache " << mCacheDir << LL_ENDL; From 1ba47f1fbfbad8afc1281c98a0513878eaac2b40 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Sun, 18 Jul 2021 13:33:20 +0200 Subject: [PATCH 5/9] FIRE-31076 Update Japanese translation, by Hiroshi Kumaki --- .../xui/ja/floater_fs_asset_blacklist.xml | 4 +-- .../skins/default/xui/ja/notifications.xml | 34 +++++++++++++++---- .../default/xui/ja/panel_main_inventory.xml | 1 + .../xui/ja/panel_preferences_colors.xml | 4 +-- .../default/xui/ja/panel_preferences_move.xml | 2 +- 5 files changed, 33 insertions(+), 12 deletions(-) diff --git a/indra/newview/skins/default/xui/ja/floater_fs_asset_blacklist.xml b/indra/newview/skins/default/xui/ja/floater_fs_asset_blacklist.xml index 572b862494..7c23edc4e6 100644 --- a/indra/newview/skins/default/xui/ja/floater_fs_asset_blacklist.xml +++ b/indra/newview/skins/default/xui/ja/floater_fs_asset_blacklist.xml @@ -31,7 +31,7 @@