diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-18 12:24:21 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-18 12:24:21 +0100 |
commit | 333f60ef3cf1a5ac4ce7687faf8369e7d0a4b2de (patch) | |
tree | edb2169b848d848d834fe6e418c397c10c89a5ff /indra/newview/llchathistory.cpp | |
parent | cb50a2395bc37f1f7833171a976f67af9f2df66d (diff) | |
parent | 9aa710945685a2cae8cfc622f3dc3d900c1ab4c9 (diff) |
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rw-r--r-- | indra/newview/llchathistory.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 18c69b5130..ab97dbb695 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -557,6 +557,11 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL { bool use_plain_text_chat_history = args["use_plain_text_chat_history"].asBoolean(); + if(mEditor) + { + mEditor->setPlainText(use_plain_text_chat_history); + } + if (!mEditor->scrolledToEnd() && chat.mFromID != gAgent.getID() && !chat.mFromName.empty()) { mUnreadChatSources.insert(chat.mFromName); |