diff options
| author | Eugene Mutavchi <emutavchi@productengine.com> | 2010-04-02 13:15:50 +0300 |
|---|---|---|
| committer | Eugene Mutavchi <emutavchi@productengine.com> | 2010-04-02 13:15:50 +0300 |
| commit | 81582cb3764c7a0d3031f8259a4be9375fb1bd81 (patch) | |
| tree | be60d65de7351532efe4d332b7e35c369bafe84d /indra/newview | |
| parent | 3962ca7a0b1469a40b5f7cb0587c65c4ebf33cb6 (diff) | |
Fixed normal bug EXT-5831(Do not apply font color to timestamps in chat history) - added new 'ChatTimestampColor' color setting, which is set to timestamps for chat history messages in text mode which are not from log.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/160/.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/skins/default/colors.xml | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 71e7ae7061..ec5e61f384 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -632,7 +632,14 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL if (use_plain_text_chat_history) { - mEditor->appendText("[" + chat.mTimeStr + "] ", mEditor->getText().size() != 0, style_params); + LLStyle::Params timestamp_style(style_params); + if (!message_from_log) + { + LLColor4 timestamp_color = LLUIColorTable::instance().getColor("ChatTimestampColor"); + timestamp_style.color(timestamp_color); + timestamp_style.readonly_color(timestamp_color); + } + mEditor->appendText("[" + chat.mTimeStr + "] ", mEditor->getText().size() != 0, timestamp_style); if (utf8str_trim(chat.mFromName).size() != 0) { diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 777d671e81..eaf95aa54c 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -731,7 +731,10 @@ <color name="ChatToastAgentNameColor" reference="EmphasisColor" /> - <color + <color name="ColorSwatchBorderColor" value="0.45098 0.517647 0.607843 1"/> + <color + name="ChatTimestampColor" + reference="White" /> </colors> |