From 5608c3998df99c9ea075c58f0f45fb23617ec2ed Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 8 Oct 2024 22:10:50 +0300
Subject: viewer#2270 The "More" button does not close the "Choose emoji"
 floater

---
 indra/llui/lltexteditor.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llui/lltexteditor.h')

diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index e9e7070414..b2b14b01e2 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -207,6 +207,7 @@ public:
     bool            getShowContextMenu() const { return mShowContextMenu; }
 
     void            showEmojiHelper();
+    void            hideEmojiHelper();
     void            setShowEmojiHelper(bool show);
     bool            getShowEmojiHelper() const { return mShowEmojiHelper; }
 
-- 
cgit v1.2.3


From 3e46d707a243e91046b3ab0af8f844d7f40f77b4 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 18 Apr 2025 17:48:02 +0300
Subject: #3758 initial chat mention support

---
 indra/llui/lltexteditor.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/llui/lltexteditor.h')

diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index b2b14b01e2..e38908734f 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -95,6 +95,8 @@ public:
     void    insertEmoji(llwchar emoji);
     void    handleEmojiCommit(llwchar emoji);
 
+    void handleMentionCommit(std::string name_url);
+
     // mousehandler overrides
     virtual bool    handleMouseDown(S32 x, S32 y, MASK mask);
     virtual bool    handleMouseUp(S32 x, S32 y, MASK mask);
@@ -258,6 +260,7 @@ protected:
     S32             remove(S32 pos, S32 length, bool group_with_next_op);
 
     void            tryToShowEmojiHelper();
+    void            tryToShowMentionHelper();
     void            focusLostHelper();
     void            updateAllowingLanguageInput();
     bool            hasPreeditString() const;
@@ -295,6 +298,7 @@ protected:
 
     bool                mAutoIndent;
     bool                mParseOnTheFly;
+    bool                mShowChatMentionPicker;
 
     void                updateLinkSegments();
     void                keepSelectionOnReturn(bool keep) { mKeepSelectionOnReturn = keep; }
-- 
cgit v1.2.3


From da2234a563c9dfca0ce80371167ceef08300de53 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 23 Apr 2025 17:36:50 +0300
Subject: #3952 insert @ name at the cursor position

---
 indra/llui/lltexteditor.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llui/lltexteditor.h')

diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index e38908734f..403ea3f4fc 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -215,6 +215,8 @@ public:
 
     void            setPassDelete(bool b) { mPassDelete = b; }
 
+    LLWString       getConvertedText() const;
+
 protected:
     void            showContextMenu(S32 x, S32 y);
     void            drawPreeditMarker();
-- 
cgit v1.2.3