Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix show muted text in chat

Browse Source
This commit is contained in:
Siana Gearz
2012-08-11 22:26:31 +02:00
parent f5923860fa
commit 4f57269518
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaterchat.cpp
View File

@@ -319,7 +319,7 @@ void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file)
{ {
// desaturate muted chat // desaturate muted chat
LLColor4 muted_color = lerp(color, LLColor4::grey, 0.5f); 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 // add objects as transient speakers that can be muted

18
indra/newview/llviewermessage.cpp
View File

@@ -3857,24 +3857,16 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
chat.mPosAgent = chatter->getPositionAgent(); 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; 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) 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); check_translate_chat(mesg, chat, only_history);
#else
add_floater_chat(chat, only_history);
#endif
} }
#else
add_floater_chat(chat, only_history);
#endif
} }
} }