diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2026-08-28 19:19:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-08-28 19:19:09 +0300 |
| commit | e3320f649d2e25aac6df491614b42c94645679c7 (patch) | |
| tree | 8e4d86e996501361576f0648e1e6203b8fe36a02 /indra/llui/lltextbase.cpp | |
| parent | 3a9706136a16caeeb85d9c76828835f1b266800f (diff) | |
| parent | 6d7abb3f97d64d0232e6499cd1e05baa31d73e5c (diff) | |
Merge pull request #6201 from secondlife/maxim/develop-6174
#6174 Allow changing maturity preference on maturity error dialog
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) |