diff options
| author | angela <angela@lindenlab.com> | 2009-11-17 10:04:41 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-17 10:04:41 +0800 |
| commit | 28aa749db58b3a4095ca7e59811900767cd897b0 (patch) | |
| tree | 82337af6ace682a5f5f5a7646f5dfd0dc44fa56a /indra/newview/llchathistory.cpp | |
| parent | 27a555e443c98ce1a41ef21e6111bdfe903894e8 (diff) | |
| parent | bce2cab144214b5a90a702e62f1e7c98e93fefc3 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 028bb7a384..bec8eb2666 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -345,7 +345,7 @@ LLView* LLChatHistory::getHeader(const LLChat& chat,const LLStyle::Params& style return header; } -void LLChatHistory::appendWidgetMessage(const LLChat& chat) +void LLChatHistory::appendWidgetMessage(const LLChat& chat, const LLStyle::Params& input_append_params) { LLView* view = NULL; std::string view_text = "\n[" + formatCurrentTime() + "] "; @@ -367,7 +367,9 @@ void LLChatHistory::appendWidgetMessage(const LLChat& chat) style_params.color(txt_color); style_params.readonly_color(txt_color); style_params.font(fontp); - + style_params.italic = input_append_params.italic; + style_params.underline = input_append_params.underline; + style_params.bold = input_append_params.bold; if (mLastFromName == chat.mFromName) { |