diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-27 15:06:53 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-27 15:06:53 +0200 |
| commit | d3d2a8d537bf1542c152afdb239f7021ebdbe78f (patch) | |
| tree | 602b749a5e2c13384b27a69a845b782449f96748 /indra/newview/llchatitemscontainerctrl.h | |
| parent | b68ccadd46d2ff094147ffd72318fd3a728c28eb (diff) | |
| parent | 86cab299b01081c8c89587fd72d81460318e4ec1 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.h')
| -rw-r--r-- | indra/newview/llchatitemscontainerctrl.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.h b/indra/newview/llchatitemscontainerctrl.h index f4b8655054..4d730573d9 100644 --- a/indra/newview/llchatitemscontainerctrl.h +++ b/indra/newview/llchatitemscontainerctrl.h @@ -1,5 +1,5 @@ /** - * @file llchatitemscontainer.h + * @file llchatitemscontainerctrl.h * @brief chat history scrolling panel implementation * * $LicenseInfo:firstyear=2004&license=viewergpl$ @@ -30,12 +30,12 @@ * $/LicenseInfo$ */ -#ifndef LL_LLCHATITEMSCONTAINER_H_ -#define LL_LLCHATITEMSCONTAINER_H_ +#ifndef LL_LLCHATITEMSCONTAINERCTRL_H_ +#define LL_LLCHATITEMSCONTAINERCTRL_H_ +#include "llchat.h" #include "llpanel.h" #include "llscrollbar.h" -#include "string" #include "llviewerchat.h" #include "lltoastpanel.h" @@ -49,10 +49,12 @@ typedef enum e_show_item_header class LLNearbyChatToastPanel: public LLToastPanelBase { protected: - LLNearbyChatToastPanel():mIsDirty(false){}; + LLNearbyChatToastPanel() + : + mIsDirty(false), + mSourceType(CHAT_SOURCE_OBJECT) + {}; public: - - ~LLNearbyChatToastPanel(){} static LLNearbyChatToastPanel* createInstance(); |