From 26a625c1e4e86011048175a06c96207f18caf82c Mon Sep 17 00:00:00 2001 From: Beq Date: Wed, 31 Jul 2024 13:25:38 +0100 Subject: [PATCH 1/4] Modernise and use override where possible to keep clang happy --- indra/newview/fsfloaterplacedetails.h | 4 ++-- indra/newview/fsfloaterradar.h | 2 +- indra/newview/fsfloaterstreamtitle.h | 6 +++--- indra/newview/fsfloaterteleporthistory.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/indra/newview/fsfloaterplacedetails.h b/indra/newview/fsfloaterplacedetails.h index c237eff94d..0c073a13d8 100644 --- a/indra/newview/fsfloaterplacedetails.h +++ b/indra/newview/fsfloaterplacedetails.h @@ -50,8 +50,8 @@ class FSPlaceDetailsPlacesParcelObserver; class FSFloaterPlaceDetails : public LLFloater { public: - FSFloaterPlaceDetails(const LLSD& seed); - virtual ~FSFloaterPlaceDetails(); + explicit FSFloaterPlaceDetails(const LLSD& seed); + ~FSFloaterPlaceDetails() override; /*virtual*/ BOOL postBuild(); /*virtual*/ void onOpen(const LLSD& key); diff --git a/indra/newview/fsfloaterradar.h b/indra/newview/fsfloaterradar.h index fce244e74f..3fc060b3e5 100644 --- a/indra/newview/fsfloaterradar.h +++ b/indra/newview/fsfloaterradar.h @@ -41,7 +41,7 @@ class FSFloaterRadar LOG_CLASS(FSFloaterRadar); public: FSFloaterRadar(const LLSD &); - virtual ~FSFloaterRadar(); + ~FSFloaterRadar() override; /*virtual*/ BOOL postBuild(); /*virtual*/ void onOpen(const LLSD& key); diff --git a/indra/newview/fsfloaterstreamtitle.h b/indra/newview/fsfloaterstreamtitle.h index 594f8bbfa0..830cb2c69e 100644 --- a/indra/newview/fsfloaterstreamtitle.h +++ b/indra/newview/fsfloaterstreamtitle.h @@ -43,7 +43,7 @@ class FSStreamTitleManager : public LLSingleton LLSINGLETON_EMPTY_CTOR(FSStreamTitleManager); public: - ~FSStreamTitleManager(); + ~FSStreamTitleManager() override; using history_vec_t = std::vector; @@ -78,7 +78,7 @@ class FSFloaterStreamTitleHistory : public LLFloater { public: FSFloaterStreamTitleHistory(const LLSD& key); - virtual ~FSFloaterStreamTitleHistory(); + ~FSFloaterStreamTitleHistory() override; BOOL postBuild() override; void draw() override; @@ -99,7 +99,7 @@ class FSFloaterStreamTitle : public LLFloater, LLEventTimer { public: FSFloaterStreamTitle(const LLSD& key); - virtual ~FSFloaterStreamTitle(); + ~FSFloaterStreamTitle() override; BOOL postBuild() override; void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE) override; diff --git a/indra/newview/fsfloaterteleporthistory.h b/indra/newview/fsfloaterteleporthistory.h index 768d8aff32..ed08e9433f 100644 --- a/indra/newview/fsfloaterteleporthistory.h +++ b/indra/newview/fsfloaterteleporthistory.h @@ -38,7 +38,7 @@ class FSFloaterTeleportHistory : public LLFloater { public: FSFloaterTeleportHistory(const LLSD& seed); - virtual ~FSFloaterTeleportHistory(); + ~FSFloaterTeleportHistory() override; BOOL postBuild(); /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask); From be58c529aaa719349a6b9b828394b18fc950378c Mon Sep 17 00:00:00 2001 From: Beq Date: Wed, 31 Jul 2024 13:26:36 +0100 Subject: [PATCH 2/4] use modern (default) impl rather than empties. --- indra/newview/fsfloaterpartialinventory.cpp | 4 +--- indra/newview/fsfloatervolumecontrols.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/indra/newview/fsfloaterpartialinventory.cpp b/indra/newview/fsfloaterpartialinventory.cpp index a206a4e341..3f8b7bd863 100644 --- a/indra/newview/fsfloaterpartialinventory.cpp +++ b/indra/newview/fsfloaterpartialinventory.cpp @@ -37,9 +37,7 @@ FSFloaterPartialInventory::FSFloaterPartialInventory(const LLSD& key) : LLFloate mRootFolderId = key["start_folder_id"].asUUID(); } -FSFloaterPartialInventory::~FSFloaterPartialInventory() -{ -} +FSFloaterPartialInventory::~FSFloaterPartialInventory() = default; BOOL FSFloaterPartialInventory::postBuild() { diff --git a/indra/newview/fsfloatervolumecontrols.cpp b/indra/newview/fsfloatervolumecontrols.cpp index e6dbb4713b..2bb037de6c 100644 --- a/indra/newview/fsfloatervolumecontrols.cpp +++ b/indra/newview/fsfloatervolumecontrols.cpp @@ -40,9 +40,7 @@ FSFloaterVolumeControls::FSFloaterVolumeControls(const LLSD& key) { } -FSFloaterVolumeControls::~FSFloaterVolumeControls() -{ -} +FSFloaterVolumeControls::~FSFloaterVolumeControls() = default; BOOL FSFloaterVolumeControls::postBuild() { From e03c3c8e9db0aaf50b426773e03a3874a5f798d8 Mon Sep 17 00:00:00 2001 From: Beq Date: Thu, 1 Aug 2024 10:27:51 +0100 Subject: [PATCH 3/4] Fix order of initialisation and uncaught exception in destructor --- indra/newview/fsfloaterprotectedfolders.cpp | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/indra/newview/fsfloaterprotectedfolders.cpp b/indra/newview/fsfloaterprotectedfolders.cpp index 3c01fba56e..bdebae3d9b 100644 --- a/indra/newview/fsfloaterprotectedfolders.cpp +++ b/indra/newview/fsfloaterprotectedfolders.cpp @@ -40,19 +40,32 @@ FSFloaterProtectedFolders::FSFloaterProtectedFolders(const LLSD& key) : LLFloater(key), - mFolderList(NULL), + mInitialized(false), mFilterSubString(LLStringUtil::null), mFilterSubStringOrig(LLStringUtil::null), mProtectedCategoriesChangedCallbackConnection(), - mInitialized(false) + mFolderList(nullptr) { } FSFloaterProtectedFolders::~FSFloaterProtectedFolders() { - if (mProtectedCategoriesChangedCallbackConnection.connected()) + try { - mProtectedCategoriesChangedCallbackConnection.disconnect(); + if (mProtectedCategoriesChangedCallbackConnection.connected()) + { + mProtectedCategoriesChangedCallbackConnection.disconnect(); + } + } + catch (const std::exception& e) + { + // Log the exception or handle it as needed + LL_WARNS() << "Exception caught in FSFloaterProtectedFolders destructor: " << e.what() << LL_ENDL; + } + catch (...) + { + // Catch any other types of exceptions + LL_WARNS() << "Unknown exception caught in FSFloaterProtectedFolders destructor" << LL_ENDL; } } From d48f3cb69c9c687eae45a3070532388341bf0672 Mon Sep 17 00:00:00 2001 From: Beq Date: Tue, 6 Aug 2024 11:48:06 +0100 Subject: [PATCH 4/4] Introduce separate webhook for manual builds Reduce noise by segregating automated and manually triggered build notifications. --- .github/workflows/build_viewer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml index 48cbc704de..caedd7f375 100644 --- a/.github/workflows/build_viewer.yml +++ b/.github/workflows/build_viewer.yml @@ -384,7 +384,7 @@ jobs: FS_BUILD_WEBHOOK_URL=${{ secrets.NIGHTLY_WEBHOOK_URL }} elif [[ "${{github.event_name }}" == "workflow_dispatch" ]]; then FS_RELEASE_FOLDER=test - FS_BUILD_WEBHOOK_URL=${{ secrets.BETA_WEBHOOK_URL }} + FS_BUILD_WEBHOOK_URL=${{ secrets.MANUAL_WEBHOOK_URL }} else FS_RELEASE_TYPE=Unknown fi