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

FIRE-11824: Dismissing a teleport offer results in the region maturity icon missing when showing the persisted teleport offer in the IM history

Ansariel 2015-02-02 11:26:56 +01:00
parent 3764413a21
commit da005aa916
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/fschathistory.cpp
View File

@ -933,7 +933,7 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
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
setPlainText(false);
LLColor4 txt_color = LLUIColorTable::instance().getColor("White");
LLColor4 name_color = LLUIColorTable::instance().getColor("ChatNameColor");
@ -1298,7 +1298,10 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
message += "]";
}
bool is_trusted = isContentTrusted();
setContentTrusted(chat.mFromID.isNull()); // <FS:Ansariel> Set trusted content temporarily for system messages
appendText(message, prependNewLineState, body_message_params); // <FS:Zi> FIRE-8600: TAB out of chat history
setContentTrusted(is_trusted);
// Uncomment this if we never need to append to the end of a message. [FS:CR]
//prependNewLineState = false;
}