diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-29 16:46:06 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-29 16:46:06 +0200 |
| commit | db4e46e93d06c03520cb7c781b8e41b6d374414d (patch) | |
| tree | 05bbd6186f1008afec9baae673a8e8126d2573ad /indra/newview/llnearbychat.cpp | |
| parent | d66d9afae1c7cd4484b72532c0103ce7a4db9e77 (diff) | |
| parent | 53173419000ba1d14aa99c59353e91f700915e07 (diff) | |
Mere from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 0a8d020b4f..90482eb74d 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -153,7 +153,7 @@ std::string appendTime() } -void LLNearbyChat::addMessage(const LLChat& chat,bool archive) +void LLNearbyChat::addMessage(const LLChat& chat,bool archive,const LLSD &args) { if (chat.mChatType == CHAT_TYPE_DEBUG_MSG) { @@ -184,7 +184,9 @@ void LLNearbyChat::addMessage(const LLChat& chat,bool archive) if (!chat.mMuted) { tmp_chat.mFromName = chat.mFromName; - mChatHistory->appendMessage(chat, use_plain_text_chat_history); + LLSD chat_args = args; + chat_args["use_plain_text_chat_history"] = use_plain_text_chat_history; + mChatHistory->appendMessage(chat, chat_args); } if(archive) |