Merge tag 'Second_Life_Release#01823996-2025.08' into 2025.08

1 files changed, 7 insertions, 4 deletions

diff --git a/indra/llui/llemojidictionary.cpp b/indra/llui/llemojidictionary.cpp
index 925608e47e..16e6f0591a 100644
--- a/indra/llui/llemojidictionary.cpp
+++ b/indra/llui/llemojidictionary.cpp
@@ -390,14 +390,17 @@ void LLEmojiDictionary::loadEmojis()
             continue;
         }
 
+        std::string category;
         std::list<std::string> categories = loadCategories(sd);
         if (categories.empty())
         {
-            LL_WARNS() << "Skipping invalid emoji descriptor (no categories)" << LL_ENDL;
-            continue;
+            // Should already have a localization for "other symbols"
+            category = "other symbols";
+        }
+        else
+        {
+            category = categories.front();
         }
-
-        std::string category = categories.front();
 
         if (std::find(mSkipCategories.begin(), mSkipCategories.end(), category) != mSkipCategories.end())
         {