diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-09-04 22:45:38 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-09-04 22:45:38 +0800 |
| commit | f7beb28baafa6600c1e8c9b6a08deb3705ba2e78 (patch) | |
| tree | 6bd3af510b83613f2e9c9627d3bf4c33e30db394 /indra/llui/lltextbase.cpp | |
| parent | f57d1d24e1a9947405587a6fe36d38ba42e097bd (diff) | |
| parent | 5ddd940bf4bd75659a86e8d0eb205a766be5d53e (diff) | |
Merge tag 'Second_Life_Release#5ddd940b-26.4' into 26.4
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 802367720f..06645df203 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -158,6 +158,7 @@ LLTextBase::Params::Params() track_end("track_end", false), read_only("read_only", false), skip_link_underline("skip_link_underline", false), + link_color("link_color"), spellcheck("spellcheck", false), v_pad("v_pad", 0), h_pad("h_pad", 0), @@ -196,6 +197,8 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p) mReadOnly(p.read_only), mSkipTripleClick(false), mSkipLinkUnderline(p.skip_link_underline), + mHasLinkColor(p.link_color.isProvided()), + mLinkColor(p.link_color.isProvided() ? p.link_color() : LLUIColor()), mSpellCheck(p.spellcheck), mSpellCheckStart(-1), mSpellCheckEnd(-1), @@ -2426,6 +2429,11 @@ void LLTextBase::appendTextImpl(const std::string& new_text, const LLStyle::Para LLStyle::Params link_params(style_params); link_params.overwriteFrom(match.getStyle()); + if (mHasLinkColor) + { + link_params.color = mLinkColor; + link_params.readonly_color = mLinkColor; + } // output the text before the Url if (start > 0) |