diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-26 16:24:49 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-26 16:24:49 -0700 |
| commit | c5c13a92eb62e1e9927a9685d5433c040e6ef2ce (patch) | |
| tree | 0134513ccbd15cccd193bc38772eb5147e0f4591 /indra/newview/llavatarlist.h | |
| parent | abcdff128c85c5a1188da8e36510f249e5918899 (diff) | |
| parent | db119d86a7a930c64b022c41386d37c001555d68 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llavatarlist.h')
| -rw-r--r-- | indra/newview/llavatarlist.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h index 81b5b2b212..b9b85094fb 100644 --- a/indra/newview/llavatarlist.h +++ b/indra/newview/llavatarlist.h @@ -37,6 +37,7 @@ #include "llavatarlistitem.h" class LLTimer; +class LLListContextMenu; /** * Generic list of avatars. @@ -76,7 +77,7 @@ public: uuid_vec_t& getIDs() { return mIDs; } bool contains(const LLUUID& id); - void setContextMenu(LLAvatarListItem::ContextMenu* menu) { mContextMenu = menu; } + void setContextMenu(LLListContextMenu* menu) { mContextMenu = menu; } void setSessionID(const LLUUID& session_id) { mSessionID = session_id; } const LLUUID& getSessionID() { return mSessionID; } @@ -126,7 +127,7 @@ private: uuid_vec_t mIDs; LLUUID mSessionID; - LLAvatarListItem::ContextMenu* mContextMenu; + LLListContextMenu* mContextMenu; commit_signal_t mRefreshCompleteSignal; mouse_signal_t mItemDoubleClickSignal; |