diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-08-24 17:31:12 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-08-24 17:31:12 -0700 |
| commit | fd62242dd6e5fa464db07e0b8ebf3ab54a6067a2 (patch) | |
| tree | 22702b94c2e4bb14a0d41356eb4cf94ca02806de /indra/newview/llimconversation.h | |
| parent | b19e6c295972c83a2637a29007bc5d0a92711ea9 (diff) | |
CHUI-280 : Make LLParticipantList derives from LLConversationItemSession
Diffstat (limited to 'indra/newview/llimconversation.h')
| -rw-r--r-- | indra/newview/llimconversation.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llimconversation.h b/indra/newview/llimconversation.h index f21be94ee2..26151ad1be 100644 --- a/indra/newview/llimconversation.h +++ b/indra/newview/llimconversation.h @@ -33,6 +33,7 @@ #include "lltransientdockablefloater.h" #include "llviewercontrol.h" #include "lleventtimer.h" +#include "llconversationmodel.h" class LLPanelChatControlPanel; class LLChatEntry; @@ -104,6 +105,7 @@ protected: LLLayoutPanel* mParticipantListPanel; LLParticipantList* mParticipantList; LLUUID mSessionID; + LLConversationViewModel mConversationViewModel; LLChatHistory* mChatHistory; LLChatEntry* mInputEditor; |