diff options
| author | angela <angela@lindenlab.com> | 2009-11-12 21:36:49 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-12 21:36:49 +0800 |
| commit | f9646bd759f87012fcf59c9ca5822490ec196666 (patch) | |
| tree | 228572fc26e369f6208f8a00f7f08a63829f3520 /indra/newview/llchatmsgbox.h | |
| parent | 95adfa4cacb68e21b7251882feffbc7cb50b4438 (diff) | |
| parent | ff09b049a7916a73301bd02f9810994025d88e06 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llchatmsgbox.h')
| -rw-r--r-- | indra/newview/llchatmsgbox.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchatmsgbox.h b/indra/newview/llchatmsgbox.h index df29db58c3..9e16616729 100644 --- a/indra/newview/llchatmsgbox.h +++ b/indra/newview/llchatmsgbox.h @@ -61,7 +61,7 @@ protected: friend class LLUICtrlFactory; public: - void addText(const LLStringExplicit &text); + void addText(const LLStringExplicit &text, const LLStyle::Params& input_params = LLStyle::Params()); private: S32 mBlockSpacing; |