summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-06-21 15:54:02 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-06-21 15:54:02 -0400
commit4eab82d5e2d71f9b0d53f5a92bc65ecc3320fee7 (patch)
tree0298f612d60eef5a3bea57e625b2582f50d37c44 /indra/newview/llchathistory.cpp
parentc838c6b64563545c15006ac20fd88afe66e5bbfc (diff)
parent17f98b36d3e3bebdcb331f91fc0f542f618be71d (diff)
merge
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rw-r--r--indra/newview/llchathistory.cpp5
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);