Merge branch '2025.04'

1 files changed, 21 insertions, 5 deletions

diff --git a/indra/newview/llfloaternewfeaturenotification.cpp b/indra/newview/llfloaternewfeaturenotification.cpp
index 369727ff1e..1badcdd3d9 100644
--- a/indra/newview/llfloaternewfeaturenotification.cpp
+++ b/indra/newview/llfloaternewfeaturenotification.cpp
@@ -43,12 +43,28 @@ bool LLFloaterNewFeatureNotification::postBuild()
     setCanDrag(false);
     getChild<LLButton>("close_btn")->setCommitCallback(boost::bind(&LLFloaterNewFeatureNotification::onCloseBtn, this));
 
-    const std::string title_txt = "title_txt";
-    const std::string dsc_txt = "description_txt";
-    std::string feature = "_" + getKey().asString();
+    if (getKey().isString())
+    {
+        const std::string title_txt = "title_txt";
+        const std::string dsc_txt = "description_txt";
 
-    getChild<LLUICtrl>(title_txt)->setValue(getString(title_txt + feature));
-    getChild<LLUICtrl>(dsc_txt)->setValue(getString(dsc_txt + feature));
+        std::string feature = "_" + getKey().asString();
+        if (hasString(title_txt + feature))
+        {
+            getChild<LLUICtrl>(title_txt)->setValue(getString(title_txt + feature));
+            getChild<LLUICtrl>(dsc_txt)->setValue(getString(dsc_txt + feature));
+        }
+        else
+        {
+            // Show blank
+            LL_WARNS() << "Feature \"" << getKey().asString() <<  "\" not found for feature notification" << LL_ENDL;
+        }
+    }
+    else
+    {
+        // Show blank
+        LL_WARNS() << "Feature notification without a feature" << LL_ENDL;
+    }
 
     if (getKey().asString() == "gltf")
     {