diff options
| author | angela <angela@lindenlab.com> | 2009-11-12 21:36:34 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-12 21:36:34 +0800 |
| commit | ff09b049a7916a73301bd02f9810994025d88e06 (patch) | |
| tree | 2f2fe764116db1401fae342c1930be5e9a70a3e3 /indra/newview/llchatmsgbox.cpp | |
| parent | 6524295bf06f58fad84dc7251f6ba3fd81ce94f2 (diff) | |
| parent | 11fc2da6fa5fba0bb659dd97f8533e4529aece06 (diff) | |
merge
Diffstat (limited to 'indra/newview/llchatmsgbox.cpp')
| -rw-r--r-- | indra/newview/llchatmsgbox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llchatmsgbox.cpp b/indra/newview/llchatmsgbox.cpp index 12626e3b43..bb0ec2db27 100644 --- a/indra/newview/llchatmsgbox.cpp +++ b/indra/newview/llchatmsgbox.cpp @@ -84,7 +84,7 @@ LLChatMsgBox::LLChatMsgBox(const Params& p) : mBlockSpacing(p.block_spacing) {} -void LLChatMsgBox::addText( const LLStringExplicit& text ) +void LLChatMsgBox::addText( const LLStringExplicit& text , const LLStyle::Params& input_params ) { S32 length = getLength(); // if there is existing text, add a separator @@ -94,5 +94,5 @@ void LLChatMsgBox::addText( const LLStringExplicit& text ) insertSegment(new ChatSeparator(length - 1, length - 1)); } // prepend newline only if there is some existing text - appendText(text, length > 0); + appendText(text, length > 0, input_params); } |