Merge branch 'master' into webrtc_alpha

.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

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()
 {

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;
 
     bool postBuild() override;
     void onOpen(const LLSD& key) override;

indra/newview/fsfloaterprotectedfolders.cpp

@@ -40,19 +40,32 @@
 
 FSFloaterProtectedFolders::FSFloaterProtectedFolders(const LLSD& key)
     : LLFloater(key),
-    mFolderList(nullptr),
+    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;
     }
 }
 

indra/newview/fsfloaterradar.h

@@ -41,7 +41,7 @@ class FSFloaterRadar
     LOG_CLASS(FSFloaterRadar);
 public:
     FSFloaterRadar(const LLSD &);
-    virtual ~FSFloaterRadar();
+    ~FSFloaterRadar() override;
 
     bool postBuild() override;
     void onOpen(const LLSD& key) override;

indra/newview/fsfloaterstreamtitle.h

@@ -43,7 +43,7 @@ class FSStreamTitleManager : public LLSingleton<FSStreamTitleManager>
     LLSINGLETON_EMPTY_CTOR(FSStreamTitleManager);
 
 public:
-    ~FSStreamTitleManager();
+    ~FSStreamTitleManager() override;
 
     using history_vec_t = std::vector<std::string>;
 
@@ -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;

indra/newview/fsfloaterteleporthistory.h

@@ -38,7 +38,7 @@ class FSFloaterTeleportHistory : public LLFloater
 {
 public:
     FSFloaterTeleportHistory(const LLSD& seed);
-    virtual ~FSFloaterTeleportHistory();
+    ~FSFloaterTeleportHistory() override;
 
     bool postBuild() override;
     bool handleKeyHere(KEY key, MASK mask) override;

indra/newview/fsfloatervolumecontrols.cpp

@@ -40,9 +40,7 @@ FSFloaterVolumeControls::FSFloaterVolumeControls(const LLSD& key)
 {
 }
 
-FSFloaterVolumeControls::~FSFloaterVolumeControls()
-{
-}
+FSFloaterVolumeControls::~FSFloaterVolumeControls() = default;
 
 bool FSFloaterVolumeControls::postBuild()
 {