diff options
| author | angela <angela@lindenlab.com> | 2009-11-13 08:43:56 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-13 08:43:56 +0800 |
| commit | 0d4ccb9d1c0761864c8b0c19f0bdd1700b425837 (patch) | |
| tree | 717db44548966f400b3d2cfb84817b01761f70b7 /indra/newview/llchatitemscontainerctrl.h | |
| parent | fd9257a5f2649d7afbf65067c0fa4653fc81272c (diff) | |
| parent | b4a3b65a602ad56baf761a8426093eda585bc572 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.h')
| -rw-r--r-- | indra/newview/llchatitemscontainerctrl.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.h b/indra/newview/llchatitemscontainerctrl.h index 8fb045b6d9..a65bfedd09 100644 --- a/indra/newview/llchatitemscontainerctrl.h +++ b/indra/newview/llchatitemscontainerctrl.h @@ -36,7 +36,7 @@ #include "llpanel.h" #include "llscrollbar.h" #include "string" -#include "llchat.h" +#include "llviewerchat.h" #include "lltoastpanel.h" typedef enum e_show_item_header @@ -59,7 +59,7 @@ public: const LLUUID& getFromID() const { return mFromID;} - void addText (const std::string& message); + void addText (const std::string& message , const LLStyle::Params& input_params = LLStyle::Params()); void setMessage (const LLChat& msg); void setWidth (S32 width); void snapToMessageHeight (); @@ -89,6 +89,8 @@ private: std::string mFromName; // agent or object name LLUUID mFromID; // agent id or object id EChatSourceType mSourceType; + LLColor4 mTextColor; + LLFontGL* mFont; std::vector<std::string> mMessages; |