diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-29 19:19:42 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-29 19:19:42 -0700 |
| commit | 73eec0321f79bb7ceeb2b2027e63660158413e5e (patch) | |
| tree | e264a8962c34f0768bed34500d4af1af8a0eba27 /indra/newview/llparticipantlist.h | |
| parent | be61b5be2f4089e12ca25ca1ece13bd0fdaea543 (diff) | |
| parent | 01a154809d650f7905aaa208150a1070b19e5c2b (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llparticipantlist.h')
| -rw-r--r-- | indra/newview/llparticipantlist.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llparticipantlist.h b/indra/newview/llparticipantlist.h index 53966c15fe..f8165aa292 100644 --- a/indra/newview/llparticipantlist.h +++ b/indra/newview/llparticipantlist.h @@ -31,13 +31,14 @@ #include "llevent.h" #include "llavatarlist.h" // for LLAvatarItemRecentSpeakerComparator #include "lllistcontextmenu.h" +#include "llconversationmodel.h" class LLSpeakerMgr; class LLAvatarList; class LLUICtrl; class LLAvalineUpdater; -class LLParticipantList +class LLParticipantList : public LLConversationItemSession { LOG_CLASS(LLParticipantList); public: @@ -46,6 +47,7 @@ public: LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* avatar_list, + LLFolderViewModelInterface& root_view_model, bool use_context_menu = true, bool exclude_agent = true, bool can_toggle_icons = true); |