diff options
| author | angela <angela@lindenlab.com> | 2009-11-13 15:20:04 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-13 15:20:04 +0800 |
| commit | a7b8b51a5aabfbe58a904896fb1e7a1c812c2bc6 (patch) | |
| tree | f16a6c5c3ffaccab7dedc7c94dcceeed4909a6ee /indra/newview/llchathistory.h | |
| parent | 9054f31f89963f2f24a6b872fbc6816ee01f0d70 (diff) | |
| parent | 01f1eaf7e0faaa3ecde36ac28a346fed53a571fd (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llchathistory.h')
| -rw-r--r-- | indra/newview/llchathistory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index f0944042af..f689a225fe 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -34,7 +34,7 @@ #define LLCHATHISTORY_H_ #include "lltexteditor.h" -#include "llchat.h" +#include "llviewerchat.h" //Chat log widget allowing addition of a message as a widget class LLChatHistory : public LLTextEditor @@ -109,7 +109,7 @@ class LLChatHistory : public LLTextEditor * @param time time of a message. * @param message message itself. */ - void appendWidgetMessage(const LLChat& chat, LLStyle::Params& style_params); + void appendWidgetMessage(const LLChat& chat); private: std::string mLastFromName; |