From bf82ab14b5766aa8aa1a10d66a510938f60d0cc6 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Wed, 23 Apr 2025 23:09:28 +0100
Subject: [PATCH] [FIRE-35393] Improved handling of bad feature notification.

---
 indra/newview/llfloaternewfeaturenotification.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llfloaternewfeaturenotification.cpp b/indra/newview/llfloaternewfeaturenotification.cpp
index 0927ecfe51..9ea51451ad 100644
--- a/indra/newview/llfloaternewfeaturenotification.cpp
+++ b/indra/newview/llfloaternewfeaturenotification.cpp
@@ -47,9 +47,20 @@ bool LLFloaterNewFeatureNotification::postBuild()
     const std::string dsc_txt = "description_txt";
     // <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())
+    if(feature.empty() )
     {
-        return true;
+        LL_WARNS("FloaterNewFeature") << "Unexpected failure - No feature name NewFeatureNotification." << LL_ENDL;
+        return false;
+    }
+    if (!hasString( title_txt + "_" + feature ) )
+    {
+        LL_WARNS("FloaterNewFeature") << "No string for " << title_txt + "_" + feature << LL_ENDL;
+        return false;
+    }
+    if (!hasString( dsc_txt + "_" + feature ) )
+    {
+        LL_WARNS("FloaterNewFeature") << "No string for " << dsc_txt + "_" + feature << LL_ENDL;
+        return false;
     }
     // </FS:Beq>