5 files changed, 10 insertions, 8 deletions
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 8705758d3f..e6fe1eca75 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -64,6 +64,8 @@
 #define BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED
 #include <boost/stacktrace.hpp>
 
+#include LLCOROS_RMUTEX_HEADER
+
 namespace {
 #if LL_WINDOWS
     void debugger_print(const std::string& s)
diff --git a/indra/newview/llfloatergltfasseteditor.cpp b/indra/newview/llfloatergltfasseteditor.cpp
index d2cf24f1dd..f28c01d713 100644
--- a/indra/newview/llfloatergltfasseteditor.cpp
+++ b/indra/newview/llfloatergltfasseteditor.cpp
@@ -46,8 +46,8 @@ LLFloaterGLTFAssetEditor::LLFloaterGLTFAssetEditor(const LLSD& key)
 {
     setTitle("GLTF Asset Editor (WIP)");
 
-    mCommitCallbackRegistrar.add("PanelObject.menuDoToSelected", [this](LLUICtrl* ctrl, const LLSD& data) { onMenuDoToSelected(data); });
-    mEnableCallbackRegistrar.add("PanelObject.menuEnable", [this](LLUICtrl* ctrl, const LLSD& data) { return onMenuEnableItem(data); });
+    mCommitCallbackRegistrar.add("PanelObject.menuDoToSelected", { [this](LLUICtrl* ctrl, const LLSD& data) { onMenuDoToSelected(data); }});
+    mEnableCallbackRegistrar.add("PanelObject.menuEnable", { [this](LLUICtrl* ctrl, const LLSD& data) { return onMenuEnableItem(data); }});
 }
 
 LLFloaterGLTFAssetEditor::~LLFloaterGLTFAssetEditor()
diff --git a/indra/newview/llfloatersettingscolor.cpp b/indra/newview/llfloatersettingscolor.cpp
index d9c382a1dc..1ca2412907 100644
--- a/indra/newview/llfloatersettingscolor.cpp
+++ b/indra/newview/llfloatersettingscolor.cpp
@@ -43,8 +43,8 @@ LLFloaterSettingsColor::LLFloaterSettingsColor(const LLSD& key)
 :   LLFloater(key),
     mSettingList(NULL)
 {
-    mCommitCallbackRegistrar.add("CommitSettings",  boost::bind(&LLFloaterSettingsColor::onCommitSettings, this));
-    mCommitCallbackRegistrar.add("ClickDefault",    boost::bind(&LLFloaterSettingsColor::onClickDefault, this));
+    mCommitCallbackRegistrar.add("CommitSettings",  { boost::bind(&LLFloaterSettingsColor::onCommitSettings, this) });
+    mCommitCallbackRegistrar.add("ClickDefault",    { boost::bind(&LLFloaterSettingsColor::onClickDefault, this) });
 }
 
 LLFloaterSettingsColor::~LLFloaterSettingsColor()
diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp
index 4a053a99de..0a01fff36d 100644
--- a/indra/newview/llfloatersettingsdebug.cpp
+++ b/indra/newview/llfloatersettingsdebug.cpp
@@ -66,7 +66,6 @@ bool LLFloaterSettingsDebug::postBuild()
     mSettingNameText = getChild<LLTextBox>("setting_name_txt");
 
     mComment = getChild<LLTextEditor>("comment_text");
-    mSettingName = getChild<LLTextBox>("setting_name_txt");
     mLLSDVal = getChild<LLTextEditor>("llsd_text");
     mCopyBtn = getChild<LLButton>("copy_btn");
 
@@ -658,6 +657,6 @@ void LLFloaterSettingsDebug::hideUIControls()
 
 void LLFloaterSettingsDebug::onClickCopy()
 {
-    std::string setting_name = mSettingName->getText();
+    std::string setting_name = mSettingNameText->getText();
     LLClipboard::instance().copyToClipboard(utf8str_to_wstring(setting_name), 0, narrow(setting_name.size()));
 }
diff --git a/indra/newview/lluilistener.cpp b/indra/newview/lluilistener.cpp
index 6f567e67f8..c389d04443 100644
--- a/indra/newview/lluilistener.cpp
+++ b/indra/newview/lluilistener.cpp
@@ -255,10 +255,11 @@ LLMenuGL::Params get_params(const LLSD&event)
 
 LLMenuGL* get_parent_menu(LLEventAPI::Response& response, const LLSD&event)
 {
-    LLMenuGL* parent_menu = gMenuBarView->findChildMenuByName(event["parent_menu"], true);
+    auto parent_menu_name{ event["parent_menu"].asString() };
+    LLMenuGL* parent_menu = gMenuBarView->findChildMenuByName(parent_menu_name, true);
     if(!parent_menu)
     {
-        response.error(stringize("Parent menu ", std::quoted(event["parent_menu"].asString()), " was not found"));
+        response.error(stringize("Parent menu ", std::quoted(parent_menu_name), " was not found"));
     }
     return parent_menu;
 }