diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-04 13:35:38 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-04 13:35:38 -0700 |
| commit | 5c14f6e783c2581d0e4401d82581e7a5def99043 (patch) | |
| tree | 579fe240496416f3c09ed7b9e29d1e06b0b2a570 /indra/newview/llimfloatercontainer.h | |
| parent | 5fbb161ba0a28e64474efc295b12bccffdcdb0e0 (diff) | |
| parent | 7bad109c3d7e6d70649839634586a09033cfb207 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llimfloatercontainer.h')
| -rw-r--r-- | indra/newview/llimfloatercontainer.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llimfloatercontainer.h b/indra/newview/llimfloatercontainer.h index d6dda8ea2d..a72a3e2221 100644 --- a/indra/newview/llimfloatercontainer.h +++ b/indra/newview/llimfloatercontainer.h @@ -37,6 +37,7 @@ #include "llgroupmgr.h" #include "lltrans.h" #include "llconversationmodel.h" +#include "llconversationview.h" class LLButton; class LLLayoutPanel; @@ -102,6 +103,8 @@ private: void onAddButtonClicked(); void onAvatarPicked(const uuid_vec_t& ids); + void onCustomAction (const LLSD& userdata); + LLButton* mExpandCollapseBtn; LLLayoutPanel* mMessagesPane; LLLayoutPanel* mConversationsPane; @@ -113,7 +116,8 @@ public: void addConversationListItem(const LLUUID& uuid); private: - LLFolderViewItem* createConversationItemWidget(LLConversationItem* item); + LLConversationViewSession* createConversationItemWidget(LLConversationItem* item); + LLConversationViewParticipant* createConversationViewParticipant(LLConversationItem* item); // Conversation list data LLPanel* mConversationsListPanel; // This is the main widget we add conversation widget to |