diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-26 08:43:57 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-26 08:43:57 +0100 |
| commit | 12cf2112413a62b44638cf080c2fdf4608db8a65 (patch) | |
| tree | 0a41eaa71baf9f7431b442b4b61b5eadb57e61cd /indra/newview/llparticipantlist.h | |
| parent | b59a80f20bd6b778ea9edfe8f5b78b2e5a25864e (diff) | |
| parent | 14418c197076d0eb01bb0852b8716fa966bc9d53 (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/llparticipantlist.h')
| -rw-r--r-- | indra/newview/llparticipantlist.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llparticipantlist.h b/indra/newview/llparticipantlist.h index abaf503868..967c8b78cf 100644 --- a/indra/newview/llparticipantlist.h +++ b/indra/newview/llparticipantlist.h @@ -32,8 +32,8 @@ #include "llviewerprecompiledheaders.h" #include "llevent.h" -#include "llpanelpeoplemenus.h" #include "llavatarlist.h" // for LLAvatarItemRecentSpeakerComparator +#include "lllistcontextmenu.h" class LLSpeakerMgr; class LLAvatarList; @@ -148,7 +148,7 @@ class LLParticipantList /** * Menu used in the participant list. */ - class LLParticipantListMenu : public LLPanelPeopleMenus::ContextMenu + class LLParticipantListMenu : public LLListContextMenu { public: LLParticipantListMenu(LLParticipantList& parent):mParent(parent){}; |