summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloatercontainer.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llimfloatercontainer.h')
-rw-r--r--indra/newview/llimfloatercontainer.h6
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