diff options
| author | Anchor <none@none> | 2019-05-10 12:22:29 -0600 |
|---|---|---|
| committer | Anchor <none@none> | 2019-05-10 12:22:29 -0600 |
| commit | 504a138cb147f6a01573c7c6453a411c330e5f73 (patch) | |
| tree | 5a89d6ff115263c9e0764f94122a86dee099b718 /indra/llui/lltextbase.h | |
| parent | f9f129f93d8eab94e58ff2229a13d68bee23f959 (diff) | |
| parent | 34322f8f37380df868703051230f2a4109602b3f (diff) | |
Merge
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 |