diff options
| author | callum_linden <none@none> | 2015-08-31 11:17:28 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-08-31 11:17:28 -0700 |
| commit | 1db2c7276d0bb1039ad8be9240201732ad5387cd (patch) | |
| tree | a2bc6f6f80772cc459f23a075ba3bc0b75b5de48 /indra/newview/llchathistory.cpp | |
| parent | 0ad81961cd5aea97231959fd31daa22dd2d8908a (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
Merge with viewer-release
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rwxr-xr-x | indra/newview/llchathistory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index f0bd63ba46..b81b95462e 100755 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -934,7 +934,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL // compact mode: show a timestamp and name if (use_plain_text_chat_history) { - square_brackets = chat.mFromName == SYSTEM_FROM; + square_brackets = chat.mSourceType == CHAT_SOURCE_SYSTEM; LLStyle::Params timestamp_style(body_message_params); |