diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-23 22:45:04 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-08-23 22:45:04 +0800 |
| commit | f95c6a4d8d9887c75f23e0512645143760f26210 (patch) | |
| tree | 100f84649cb7f69fa4371bd80b9a78f659eee53c /indra/newview/llchathistory.cpp | |
| parent | a9113d199645fcd3db46e120c0d9e86fb3f1ce93 (diff) | |
| parent | 2b0a318facb9b698ed6818be6e0f4488cb6ba272 (diff) | |
Merge branch 'main' into 2024.06-atlasaurus
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index fc50691ece..c004534617 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -1249,7 +1249,10 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL LLStyle::Params body_message_params; body_message_params.color(txt_color); - body_message_params.readonly_color(txt_color); + if (args["COLOR"]) + body_message_params.readonly_color(LLUIColorTable::instance().getColor(args["COLOR"])); + else + body_message_params.readonly_color(txt_color); body_message_params.font.name(font_name); body_message_params.font.size(font_size); body_message_params.font.style(input_append_params.font.style); |