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/llcallfloater.h | |
| parent | b19e6c295972c83a2637a29007bc5d0a92711ea9 (diff) | |
CHUI-280 : Make LLParticipantList derives from LLConversationItemSession
Diffstat (limited to 'indra/newview/llcallfloater.h')
| -rw-r--r-- | indra/newview/llcallfloater.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h index 00a3f76e56..181c92276d 100644 --- a/indra/newview/llcallfloater.h +++ b/indra/newview/llcallfloater.h @@ -31,6 +31,7 @@ #include "lltransientdockablefloater.h" #include "llvoicechannel.h" #include "llvoiceclient.h" +#include "llconversationmodel.h" class LLAvatarList; class LLAvatarListItem; @@ -228,6 +229,7 @@ private: LLSpeakerMgr* mSpeakerManager; LLParticipantList* mParticipants; LLAvatarList* mAvatarList; + LLConversationViewModel mConversationViewModel; LLNonAvatarCaller* mNonAvatarCaller; EVoiceControls mVoiceType; LLPanel* mAgentPanel; |