diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-08 10:37:34 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-08 10:37:34 -0700 |
| commit | 65cb4b6d20b52ffebdc93e0e19f99520f6364dde (patch) | |
| tree | d2b6ff74ce2d40f5de91b95fe7b5e21701d6e181 /indra/llui/lltextbase.h | |
| parent | f14888b6166f91533e778e94701b74a9639ebefd (diff) | |
| parent | 34322f8f37380df868703051230f2a4109602b3f (diff) | |
Merge 6.2.2
Diffstat (limited to 'indra/llui/lltextbase.h')
| -rw-r--r-- | indra/llui/lltextbase.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 5fdde445ef..9831c35858 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -275,7 +275,8 @@ typedef LLPointer<LLTextSegment> LLTextSegmentPtr; class LLTextBase : public LLUICtrl, protected LLEditMenuHandler, - public LLSpellCheckMenuHandler + public LLSpellCheckMenuHandler, + public ll::ui::SearchableControl { public: friend class LLTextSegment; @@ -617,6 +618,11 @@ protected: void appendAndHighlightTextImpl(const std::string &new_text, S32 highlight_part, const LLStyle::Params& style_params, bool underline_on_hover_only = false); S32 normalizeUri(std::string& uri); +protected: + virtual std::string _getSearchText() const + { + return mLabel.getString() + getToolTip(); + } protected: // text segmentation and flow |