diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-23 09:52:00 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-23 09:52:00 -0800 |
| commit | 5733f7090460ea2591bf1af961409c1a77cc916e (patch) | |
| tree | fccda7ae74da59d4541f2825178ea35c71bd3e9b /indra/newview/llfloaterconversationpreview.cpp | |
| parent | d0204ab367f5ceb5eab89e2273b897975acbfe5a (diff) | |
| parent | e6000d5930dd646bb15951336670bab4950515d8 (diff) | |
merging
Diffstat (limited to 'indra/newview/llfloaterconversationpreview.cpp')
| -rw-r--r-- | indra/newview/llfloaterconversationpreview.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llfloaterconversationpreview.cpp b/indra/newview/llfloaterconversationpreview.cpp index c93181c0a1..48e0caa0ce 100644 --- a/indra/newview/llfloaterconversationpreview.cpp +++ b/indra/newview/llfloaterconversationpreview.cpp @@ -152,7 +152,13 @@ void LLFloaterConversationPreview::showHistory() chat.mSourceType = LLFloaterIMNearbyChat::isWordsName(from) ? CHAT_SOURCE_UNKNOWN : CHAT_SOURCE_OBJECT; } - mChatHistory->appendMessage(chat); + LLSD chat_args; + chat_args["use_plain_text_chat_history"] = + gSavedSettings.getBOOL("PlainTextChatHistory"); + chat_args["show_time"] = gSavedSettings.getBOOL("IMShowTime"); + chat_args["show_names_for_p2p_conv"] = gSavedSettings.getBOOL("IMShowNamesForP2PConv"); + + mChatHistory->appendMessage(chat,chat_args); } } |