From f4c3f1796450596b019d841f4bf8a891ecf5c27c Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sat, 19 Apr 2025 21:51:38 +0100
Subject: [PATCH] FIRE-35393 - Don't crash when feature string is empty.

---
 indra/newview/llfloaternewfeaturenotification.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llfloaternewfeaturenotification.cpp b/indra/newview/llfloaternewfeaturenotification.cpp
index 369727ff1e..0927ecfe51 100644
--- a/indra/newview/llfloaternewfeaturenotification.cpp
+++ b/indra/newview/llfloaternewfeaturenotification.cpp
@@ -45,10 +45,16 @@ bool LLFloaterNewFeatureNotification::postBuild()
 
     const std::string title_txt = "title_txt";
     const std::string dsc_txt = "description_txt";
-    std::string feature = "_" + getKey().asString();
-
-    getChild<LLUICtrl>(title_txt)->setValue(getString(title_txt + feature));
-    getChild<LLUICtrl>(dsc_txt)->setValue(getString(dsc_txt + feature));
+    // <FS:Beq> FIRE-35393 stop crashing just cos whirly does something daft and blames Atlas for it
+    std::string feature = getKey().asString();
+    if(feature.empty())
+    {
+        return true;
+    }
+    // </FS:Beq>
+    
+    getChild<LLUICtrl>(title_txt)->setValue(getString(title_txt + "_" + feature));
+    getChild<LLUICtrl>(dsc_txt)->setValue(getString(dsc_txt + "_" + feature));
 
     if (getKey().asString() == "gltf")
     {