diff options
| author | maxim@mnikolenko <maxim@mnikolenko> | 2013-01-23 14:32:18 +0200 |
|---|---|---|
| committer | maxim@mnikolenko <maxim@mnikolenko> | 2013-01-23 14:32:18 +0200 |
| commit | e6000d5930dd646bb15951336670bab4950515d8 (patch) | |
| tree | 358ad2b6125c733f8596218060b4f3a70c906af3 /indra | |
| parent | dc19930f1586dcc879a8e9c1653be8f1b47e4795 (diff) | |
CHUI-424 FIXED Args for appendMessage() are added to respect Compact/Expanded mode
Diffstat (limited to 'indra')
| -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); } } |