diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-10-14 16:30:08 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-10-14 16:30:08 -0700 |
| commit | c2f5365f986aab49d5c7cfa2834a68f5b35c09c2 (patch) | |
| tree | 4cbbf7bd730ad0ad3aa00569c4364dad51de6082 /indra/newview/llchatitemscontainerctrl.h | |
| parent | 0cf0efb6e31d505bc079f757fe7d832110797199 (diff) | |
| parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.h')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llchatitemscontainerctrl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.h b/indra/newview/llchatitemscontainerctrl.h index 1d700dcede..54b6499d52 100644..100755 --- a/indra/newview/llchatitemscontainerctrl.h +++ b/indra/newview/llchatitemscontainerctrl.h @@ -40,18 +40,18 @@ typedef enum e_show_item_header CHATITEMHEADER_SHOW_BOTH } EShowItemHeader; -class LLNearbyChatToastPanel: public LLToastPanelBase +class LLFloaterIMNearbyChatToastPanel : public LLPanel { protected: - LLNearbyChatToastPanel() + LLFloaterIMNearbyChatToastPanel() : mIsDirty(false), mSourceType(CHAT_SOURCE_OBJECT) {}; public: - ~LLNearbyChatToastPanel(){} + ~LLFloaterIMNearbyChatToastPanel(){} - static LLNearbyChatToastPanel* createInstance(); + static LLFloaterIMNearbyChatToastPanel* createInstance(); const LLUUID& getFromID() const { return mFromID;} const std::string& getFromName() const { return mFromName; } |