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

Only show icons from system messages in P2P sessions

Ansariel 2015-02-02 15:47:32 +01:00
parent b89e85d858
commit a7e1bebf08
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/fschathistory.cpp
View File

@ -1299,8 +1299,8 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
}
bool is_trusted = isContentTrusted();
setContentTrusted(chat.mFromID.isNull()); // <FS:Ansariel> Set trusted content temporarily for system messages
setPlainText(use_plain_text_chat_history ? chat.mFromID.notNull() : false);
setContentTrusted(chat.mFromID.isNull() && is_p2p); // <FS:Ansariel> Set trusted content temporarily for system messages
setPlainText(use_plain_text_chat_history ? (chat.mFromID.notNull() && is_p2p) : false);
appendText(message, prependNewLineState, body_message_params); // <FS:Zi> FIRE-8600: TAB out of chat history
setContentTrusted(is_trusted);
setPlainText(use_plain_text_chat_history);