1 files changed, 11 insertions, 5 deletions

diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index b2b14b01e2..cdfcbcdd63 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);
@@ -142,8 +144,10 @@ public:
     virtual bool    canDoDelete() const;
     virtual void    selectAll();
     virtual bool    canSelectAll()  const;
+    virtual void    deselect();
 
     void            selectByCursorPosition(S32 prev_cursor_pos, S32 next_cursor_pos);
+    void            setSelectAllOnFocusReceived(bool b);
 
     virtual bool    canLoadOrSaveToFile();
 
@@ -200,7 +204,6 @@ 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; }
@@ -213,12 +216,12 @@ public:
 
     void            setPassDelete(bool b) { mPassDelete = b; }
 
+    LLWString       getConvertedText() const;
+
 protected:
     void            showContextMenu(S32 x, S32 y);
     void            drawPreeditMarker();
 
-    void            assignEmbedded(const std::string &s);
-
     void            removeCharOrTab();
 
     void            indentSelectedLines( S32 spaces );
@@ -238,7 +241,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; }
@@ -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; }
@@ -305,7 +309,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();
@@ -334,6 +338,8 @@ private:
     bool            mEnableTooltipPaste;
     bool            mPassDelete;
     bool            mKeepSelectionOnReturn; // disabling of removing selected text after pressing of Enter
+    bool            mSelectAllOnFocusReceived;
+    bool            mSelectedOnFocusReceived;
 
     LLUUID          mSourceID;