diff options
| author | Rider Linden <rider@lindenlab.com> | 2025-03-25 09:58:43 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2025-03-25 09:58:43 -0700 |
| commit | b86c36eafcdb0fb42c1b68ef671050dea67dc6c3 (patch) | |
| tree | dfa54e83a9ccac2c5346210c05626e61760e2822 /indra/llui/lltextbox.cpp | |
| parent | 48ccb0f75b078670ced1f8fe8d4942abe0a6f293 (diff) | |
| parent | 423df2ba4b731417796478c449e3e8f3d166ef21 (diff) | |
Merge remote-tracking branch 'remotes/origin/develop' into rider/bot_tattle
Fix conflicts
Diffstat (limited to 'indra/llui/lltextbox.cpp')
| -rw-r--r-- | indra/llui/lltextbox.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp index 05af36b71e..9f945d3735 100644 --- a/indra/llui/lltextbox.cpp +++ b/indra/llui/lltextbox.cpp @@ -159,7 +159,8 @@ LLSD LLTextBox::getValue() const bool LLTextBox::setTextArg( const std::string& key, const LLStringExplicit& text ) { mText.setArg(key, text); - LLTextBase::setText(mText.getString()); + static const LLStyle::Params input_params = LLStyle::Params(); + LLTextBase::setText(mText.getString(), input_params); return true; } |