summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llchathistory.cpp5
-rw-r--r--indra/newview/llvoavatar.cpp8
2 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 4a08eace62..9925a1de47 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);
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 24e1cd83db..9dea345954 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -820,7 +820,9 @@ LLVOAvatar::~LLVOAvatar()
LLChat chat{llformat("%s left.", display_name.c_str())};
chat.mFromName = display_name;
chat.mFromID = getID();
- LLNotificationsUI::LLNotificationManager::instance().onChat(chat, LLSD{});
+ LLSD args;
+ args["COLOR"] = "ChatHistoryTextColor";
+ LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args);
}
if (!mFullyLoaded)
{
@@ -2490,7 +2492,9 @@ U32 LLVOAvatar::processUpdateMessage(LLMessageSystem *mesgsys,
LLChat chat{llformat("%s arrived (%.1f m).", display_name.c_str(), dist_vec(*pos_it, gAgent.getPositionGlobal()))};
chat.mFromName = display_name;
chat.mFromID = getID();
- LLNotificationsUI::LLNotificationManager::instance().onChat(chat, LLSD{});
+ LLSD args;
+ args["COLOR"] = "ChatHistoryTextColor";
+ LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args);
break;
}
}