Merge branch 'release/2025.04' into rye/forevermac

1 files changed, 17 insertions, 2 deletions

diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 3537c764b9..fe4cce29ab 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 )
@@ -1211,6 +1218,14 @@ void LLTextEditor::showEmojiHelper()
     LLEmojiHelper::instance().showHelper(this, cursorRect.mLeft, cursorRect.mTop, LLStringUtil::null, cb);
 }
 
+void LLTextEditor::hideEmojiHelper()
+{
+    if (mShowEmojiHelper)
+    {
+        LLEmojiHelper::instance().hideHelper(this);
+    }
+}
+
 void LLTextEditor::tryToShowEmojiHelper()
 {
     if (mReadOnly || !mShowEmojiHelper)