Merge tag 'Second_Life_Release#9a333e65-2025.04' into 2025.04

1 files changed, 2 insertions, 5 deletions

diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index e9e7070414..353a7b93a0 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -200,13 +200,13 @@ public:
     const LLUUID&   getSourceID() const                     { return mSourceID; }
 
     const LLTextSegmentPtr  getPreviousSegment() const;
-    const LLTextSegmentPtr  getLastSegment() const;
     void            getSelectedSegments(segment_vec_t& segments) const;
 
     void            setShowContextMenu(bool show) { mShowContextMenu = show; }
     bool            getShowContextMenu() const { return mShowContextMenu; }
 
     void            showEmojiHelper();
+    void            hideEmojiHelper();
     void            setShowEmojiHelper(bool show);
     bool            getShowEmojiHelper() const { return mShowEmojiHelper; }
 
@@ -216,8 +216,6 @@ protected:
     void            showContextMenu(S32 x, S32 y);
     void            drawPreeditMarker();
 
-    void            assignEmbedded(const std::string &s);
-
     void            removeCharOrTab();
 
     void            indentSelectedLines( S32 spaces );
@@ -237,7 +235,6 @@ protected:
 
     void            autoIndent();
 
-    void            findEmbeddedItemSegments(S32 start, S32 end);
     void            getSegmentsInRange(segment_vec_t& segments, S32 start, S32 end, bool include_partial) const;
 
     virtual llwchar pasteEmbeddedItem(llwchar ext_char) { return ext_char; }
@@ -304,7 +301,7 @@ private:
     // Methods
     //
     void            pasteHelper(bool is_primary);
-    void            cleanStringForPaste(LLWString & clean_string);
+    void            cleanStringForPaste(LLWString& clean_string);
     void            pasteTextWithLinebreaks(LLWString & clean_string);
 
     void            onKeyStroke();