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

FIRE-7721: Keyword alert for local chat doesn't change the color unless keyword alert for IMs and Group is enabled

Ansariel 2014-09-07 15:18:31 +02:00
parent 34416511b6
commit fcbeb705af
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/fschathistory.cpp
View File

@ -936,13 +936,14 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
bool square_brackets = false; // square brackets necessary for a system messages
bool is_p2p = args.has("is_p2p") && args["is_p2p"].asBoolean();
bool is_conversation_log = args.has("conversation_log") && args["conversation_log"].asBoolean(); // <FS:CR> Don't dim chat in conversation log
bool is_local = args.has("is_local") && args["is_local"].asBoolean();
bool from_me = chat.mFromID == gAgent.getID();
setPlainText(use_plain_text_chat_history); // <FS:Zi> FIRE-8600: TAB out of chat history
LLColor4 txt_color = LLUIColorTable::instance().getColor("White");
LLColor4 name_color = LLUIColorTable::instance().getColor("ChatNameColor");
LLViewerChat::getChatColor(chat, txt_color, false);
LLViewerChat::getChatColor(chat, txt_color, is_local);
LLFontGL* fontp = LLViewerChat::getChatFont();
std::string font_name = LLFontGL::nameFromFont(fontp);
std::string font_size = LLFontGL::sizeFromFont(fontp);

1
indra/newview/fsfloaternearbychat.cpp
View File

@ -219,6 +219,7 @@ void FSFloaterNearbyChat::addMessage(const LLChat& chat,bool archive,const LLSD
LLSD chat_args = args;
chat_args["use_plain_text_chat_history"] = use_plain_text_chat_history;
chat_args["show_time"] = show_timestamps_nearby_chat;
chat_args["is_local"] = true;
mChatHistoryMuted->appendMessage(chat, chat_args);
// </FS:Ansariel> Optional muted chat history
if (!chat.mMuted)