diff options
author | Erik Kundiman <erik@megapahit.org> | 2025-04-30 09:40:14 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2025-04-30 09:40:14 +0800 |
commit | c0a2498fa1ff074fa29b31bbd63b2ac6f69b38bb (patch) | |
tree | 0909d51200a3de225f20ebe7d0aa7cb95fb380e1 /indra/llui/llurlregistry.h | |
parent | 39cc9a1706340d6f84b152593a4d8aaeeaa88b56 (diff) | |
parent | d9e55c44152064133796bfb08f1da524387c1300 (diff) |
Merge tag 'Second_Life_Release#d9e55c44-Second_Life_Release#d9e55c4-2025.04' into 2025.04
Diffstat (limited to 'indra/llui/llurlregistry.h')
-rw-r--r-- | indra/llui/llurlregistry.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llurlregistry.h b/indra/llui/llurlregistry.h index c22af0dbc4..b9502f4592 100644 --- a/indra/llui/llurlregistry.h +++ b/indra/llui/llurlregistry.h @@ -75,7 +75,7 @@ public: /// your callback is invoked if the matched Url's label changes in the future bool findUrl(const std::string &text, LLUrlMatch &match, const LLUrlLabelCallback &cb = &LLUrlRegistryNullCallback, - bool is_content_trusted = false); + bool is_content_trusted = false, bool skip_non_mentions = false); /// a slightly less efficient version of findUrl for wide strings bool findUrl(const LLWString &text, LLUrlMatch &match, @@ -101,6 +101,7 @@ private: LLUrlEntryBase* mUrlEntrySLLabel; LLUrlEntryBase* mUrlEntryNoLink; LLUrlEntryBase* mUrlEntryKeybinding; + LLUrlEntryBase* mUrlEntryAgentMention; }; #endif |