diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-13 19:44:01 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-13 19:44:01 +0000 |
| commit | 224cfffa1c46e144f290402f33b96d23cb27d98c (patch) | |
| tree | 052fd0e5c761542d89d3b2553a02acaf68d4d408 /indra/newview/llchatmsgbox.cpp | |
| parent | 7722105e4ea4b5268f2eb1862eae2d55b3bfc933 (diff) | |
| parent | 7e2d2406584ffe3a0c2f87734ada194a92b82df6 (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); } |