livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-13649: Chat history doesn't obey muted chat color setting

Ansariel 2014-05-06 19:44:01 +02:00
parent 7e684498ac
commit c82ac1e5f6
6 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/fschathistory.cpp
View File

@ -1282,16 +1282,6 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
message = chat.mFromName + message;
}
// <FS:Ansariel> Optional muted chat history
if (chat.mMuted)
{
LLUIColor muted_text_color = LLUIColorTable::instance().getColor("ChatHistoryMutedTextColor");
body_message_params.color = muted_text_color;
body_message_params.readonly_color = muted_text_color;
body_message_params.selected_color = muted_text_color;
}
// </FS:Ansariel> Optional muted chat history
if(chat.mSourceType != CHAT_SOURCE_OBJECT && (chat.mChatType == CHAT_TYPE_IM || chat.mChatType == CHAT_TYPE_IM_GROUP)) // FS::LO Fix for FIRE-6334; Fade IM Text into background of chat history default setting should not be 0.5; made object IM text not fade into the background as per phoenix behavior.
{
body_message_params.color.alpha = FSIMChatHistoryFade;

12
indra/newview/llviewerchat.cpp
View File

@ -50,11 +50,13 @@ LLViewerChat::font_change_signal_t LLViewerChat::sChatFontChangedSignal;
//static
void LLViewerChat::getChatColor(const LLChat& chat, LLColor4& r_color, bool is_local)
{
if(chat.mMuted)
{
r_color= LLUIColorTable::instance().getColor("LtGray");
}
else
// <FS:Ansariel> FIRE-1061 - Color friends, lindens, muted, etc
//if(chat.mMuted)
//{
// r_color= LLUIColorTable::instance().getColor("LtGray");
//}
//else
// </FS:Ansariel>
{
switch(chat.mSourceType)
{

3
indra/newview/skins/ansastorm/colors.xml
View File

@ -519,9 +519,6 @@
<color
name="ChatHistoryTextColor"
reference="LtGray" />
<color
name="ChatHistoryMutedTextColor"
reference="White_70" />
<color
name="ColorDropShadow"
reference="Black_50" />

3
indra/newview/skins/ansastorm/themes/classic_brown/colors.xml
View File

@ -519,9 +519,6 @@
<color
name="ChatHistoryTextColor"
reference="LtGray" />
<color
name="ChatHistoryMutedTextColor"
reference="White_70" />
<color
name="ColorDropShadow"
reference="Black_50" />

3
indra/newview/skins/ansastorm/themes/ectoplasma/colors.xml
View File

@ -482,9 +482,6 @@
<color
name="ChatHistoryTextColor"
reference="LtGray" />
<color
name="ChatHistoryMutedTextColor"
reference="White_70" />
<color
name="ColorDropShadow"
reference="Black_50" />

3
indra/newview/skins/default/colors.xml
View File

@ -466,9 +466,6 @@
<color
name="ChatHistoryTextColor"
reference="LtGray" />
<color
name="ChatHistoryMutedTextColor"
reference="White_70" />
<color
name="ColorDropShadow"
reference="Black_50" />