Merge pull request #3911 from secondlife/main

Merge 2025.03 release into develop.

12 files changed, 63 insertions, 13 deletions

diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 1bce31edb1..d2534b3939 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -837,7 +837,7 @@ void LLButton::draw()
 
     // Highlight if needed
     if( ll::ui::SearchableControl::getHighlighted() )
-        label_color = ll::ui::SearchableControl::getHighlightColor();
+        label_color = ll::ui::SearchableControl::getHighlightFontColor();
 
     // overlay with keyboard focus border
     if (hasFocus())
diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp
index 03717da80b..b10ec51f18 100644
--- a/indra/llui/llcommandmanager.cpp
+++ b/indra/llui/llcommandmanager.cpp
@@ -170,12 +170,14 @@ bool LLCommandManager::load()
 
     if (!parser.readXUI(commands_file, commandsParams))
     {
+        LLError::LLUserWarningMsg::showMissingFiles();
         LL_ERRS() << "Unable to load xml file: " << commands_file << LL_ENDL;
         return false;
     }
 
     if (!commandsParams.validateBlock())
     {
+        LLError::LLUserWarningMsg::showMissingFiles();
         LL_ERRS() << "Invalid commands file: " << commands_file << LL_ENDL;
         return false;
     }
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 18bde344a0..6d0cfcba95 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -23,7 +23,7 @@
 * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
 * $/LicenseInfo$
 */
-#include "../newview/llviewerprecompiledheaders.h"
+#include "linden_common.h"
 
 #include "llflashtimer.h"
 
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 69ffa9a94f..c11b42a348 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -508,7 +508,7 @@ void LLMenuItemGL::draw( void )
 
     // Highlight if needed
     if( ll::ui::SearchableControl::getHighlighted() )
-        color = ll::ui::SearchableControl::getHighlightColor();
+        color = ll::ui::SearchableControl::getHighlightFontColor();
 
     // Draw the text on top.
     if (mBriefItem)
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 7405413a3d..a05feab1d9 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -614,6 +614,13 @@ void LLNotification::cancel()
 LLSD LLNotification::getResponseTemplate(EResponseTemplateType type)
 {
     LLSD response = LLSD::emptyMap();
+
+    if (!mForm)
+    {
+        LL_WARNS("Notifications") << "Null form when getting response template for notification " << getName() << LL_ENDL;
+        return response;
+    }
+
     for (S32 element_idx = 0;
         element_idx < mForm->getNumElements();
         ++element_idx)
@@ -1249,9 +1256,26 @@ LLNotifications::LLNotifications()
     LLInstanceTracker<LLNotificationChannel, std::string>::instanceCount();
 }
 
+
+LLNotifications::~LLNotifications()
+{
+    // Clear explicitly, something in ~LLNotifications() crashes so narrowing down suspects
+    pHistoryChannel = nullptr;
+    pExpirationChannel = nullptr;
+    mGlobalStrings.clear();
+    mTemplates.clear();
+    mVisibilityRules.clear();
+    mUniqueNotifications.clear();
+    mListener = nullptr;
+}
+
 void LLNotifications::clear()
 {
-   mDefaultChannels.clear();
+    mDefaultChannels.clear();
+    // At this point mTemplates still gets used by lingering notifications
+    // to do responses (ex: group notice will call forceResponse()), but
+    // since network should be down and everything save, it's questionable
+    // whether it should stay that way
 }
 
 // The expiration channel gets all notifications that are cancelled
@@ -1464,6 +1488,13 @@ bool LLNotifications::templateExists(std::string_view name)
 void LLNotifications::forceResponse(const LLNotification::Params& params, S32 option)
 {
     LLNotificationPtr temp_notify(new LLNotification(params));
+
+    if (!temp_notify->getForm())
+    {
+        LL_WARNS("Notifications") << "Cannot force response for notification with null form: " << (std::string)params.name << LL_ENDL;
+        return;
+    }
+
     LLSD response = temp_notify->getResponseTemplate();
     LLSD selected_item = temp_notify->getForm()->getElement(option);
 
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 46286457cf..138f1969d5 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -887,7 +887,7 @@ class LLNotifications :
 {
     LLSINGLETON(LLNotifications);
     LOG_CLASS(LLNotifications);
-    virtual ~LLNotifications() {}
+    virtual ~LLNotifications();
 
 public:
 
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 93bd3c6bed..245339b107 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -3394,7 +3394,7 @@ bool LLScrollListCtrl::highlightMatchingItems(const std::string& filter_str)
 
     bool res = false;
 
-    setHighlightedColor(LLUIColorTable::instance().getColor("SearchableControlHighlightColor", LLColor4::red));
+    setHighlightedColor(LLUIColorTable::instance().getColor("SearchableControlHighlightBgColor", LLColor4::red4));
 
     std::string filter_str_lc(filter_str);
     LLStringUtil::toLower(filter_str_lc);
diff --git a/indra/llui/llsearchablecontrol.h b/indra/llui/llsearchablecontrol.h
index 119852b763..bae85fe9a5 100644
--- a/indra/llui/llsearchablecontrol.h
+++ b/indra/llui/llsearchablecontrol.h
@@ -43,9 +43,15 @@ namespace ll
             virtual ~SearchableControl()
             { }
 
-            const LLColor4& getHighlightColor( ) const
+            const LLColor4& getHighlightBgColor( ) const
             {
-                static LLUIColor highlight_color = LLUIColorTable::instance().getColor("SearchableControlHighlightColor", LLColor4::red);
+                static LLUIColor highlight_color = LLUIColorTable::instance().getColor("SearchableControlHighlightBgColor", LLColor4::red4);
+                return highlight_color.get();
+            }
+
+            const LLColor4& getHighlightFontColor() const
+            {
+                static LLUIColor highlight_color = LLUIColorTable::instance().getColor("SearchableControlHighlightFontColor", LLColor4::red4);
                 return highlight_color.get();
             }
 
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index fae22fd248..41e7094163 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1378,7 +1378,7 @@ void LLTextBase::draw()
     // Draw highlighted if needed
     if( ll::ui::SearchableControl::getHighlighted() )
     {
-        const LLColor4& bg_color = ll::ui::SearchableControl::getHighlightColor();
+        const LLColor4& bg_color = ll::ui::SearchableControl::getHighlightBgColor();
         LLRect bg_rect = mVisibleTextRect;
         if( mScroller )
             bg_rect.intersectWith( text_rect );
diff --git a/indra/llui/lltextbox.h b/indra/llui/lltextbox.h
index a3cde45cd0..500dc8669f 100644
--- a/indra/llui/lltextbox.h
+++ b/indra/llui/lltextbox.h
@@ -76,6 +76,12 @@ protected:
     LLUIString          mText;
     callback_t          mClickedCallback;
     bool                mShowCursorHand;
+
+protected:
+    virtual std::string _getSearchText() const
+    {
+        return LLTextBase::_getSearchText() + mText.getString();
+    }
 };
 
 // Build time optimization, generate once in .cpp file
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 3537c764b9..77a4976f6b 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -209,8 +209,15 @@ public:
     }
     virtual bool execute( LLTextBase* editor, S32* delta )
     {
-        mWString = editor->getWText().substr(getPosition(), mLen);
-        *delta = remove(editor, getPosition(), mLen );
+        try
+        {
+            mWString = editor->getWText().substr(getPosition(), mLen);
+            *delta = remove(editor, getPosition(), mLen);
+        }
+        catch (std::out_of_range&)
+        {
+            return false;
+        }
         return (*delta != 0);
     }
     virtual S32 undo( LLTextBase* editor )
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index 375cd539b7..9890d3f7ef 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -31,8 +31,6 @@
 #include "llrect.h"
 #include "llcoord.h"
 #include "llcontrol.h"
-#include "llcoord.h"
-#include "llcontrol.h"
 #include "llinitparam.h"
 #include "llregistry.h"
 #include "llrender2dutils.h"