From 4f572695180ef824558e46d0516491d21365089d Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Sat, 11 Aug 2012 22:26:31 +0200 Subject: [PATCH] Fix show muted text in chat --- indra/newview/llfloaterchat.cpp | 2 +- indra/newview/llviewermessage.cpp | 18 +++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp index 1a097aabb..22281826d 100644 --- a/indra/newview/llfloaterchat.cpp +++ b/indra/newview/llfloaterchat.cpp @@ -319,7 +319,7 @@ void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file) { // desaturate muted chat LLColor4 muted_color = lerp(color, LLColor4::grey, 0.5f); - add_timestamped_line(history_editor_with_mute, chat, color); + add_timestamped_line(history_editor_with_mute, chat, muted_color); } // add objects as transient speakers that can be muted diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index abd25368d..bebc154b1 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3857,24 +3857,16 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) chat.mPosAgent = chatter->getPositionAgent(); } - // truth table: - // LINDEN MUTED BUSY OWNED_BY_YOU TASK DISPLAY STORE IN HISTORY - // F T * * * No No - // F F T F * No Yes - // * F F * * Yes Yes - // * F * T * Yes Yes - // T * * * F Yes Yes - chat.mMuted = is_muted && !is_linden; + bool only_history = visible_in_chat_bubble || (!is_linden && !is_owned_by_me && is_busy); +#if 0 // Google translate doesn't work anymore if (!chat.mMuted) { - bool only_history = visible_in_chat_bubble || (!is_linden && !is_owned_by_me && is_busy); -#if 0 // Google translate doesn't work anymore check_translate_chat(mesg, chat, only_history); -#else - add_floater_chat(chat, only_history); -#endif } +#else + add_floater_chat(chat, only_history); +#endif } }