diff options
| author | angela <angela@lindenlab.com> | 2009-11-12 21:20:18 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-12 21:20:18 +0800 |
| commit | 11fc2da6fa5fba0bb659dd97f8533e4529aece06 (patch) | |
| tree | 8bacc0518c6556c341780d325de9c968d7abaeb3 /indra/newview/llchathistory.cpp | |
| parent | b1a81afef6395e136f26e296311ec9b57eef260e (diff) | |
make color and font affecting both nearby chat and toasts
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 2ccd6b7d35..cc014e3c28 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -330,7 +330,7 @@ LLView* LLChatHistory::getHeader(const LLChat& chat) return header; } -void LLChatHistory::appendWidgetMessage(const LLChat& chat, LLStyle::Params& style_params) +void LLChatHistory::appendWidgetMessage(const LLChat& chat) { LLView* view = NULL; std::string view_text; @@ -370,7 +370,17 @@ void LLChatHistory::appendWidgetMessage(const LLChat& chat, LLStyle::Params& sty appendWidget(p, view_text, false); //Append the text message + + LLColor4 txt_color = LLUIColorTable::instance().getColor("White"); + LLViewerChat::getChatColor(chat,txt_color); + LLFontGL* fontp = LLViewerChat::getChatFont(); + std::string message = chat.mText + '\n'; + + LLStyle::Params style_params; + style_params.color(txt_color); + style_params.font(fontp); + appendText(message, FALSE, style_params); mLastFromName = chat.mFromName; |