diff options
Diffstat (limited to 'indra/newview/llavatarlist.h')
| -rw-r--r-- | indra/newview/llavatarlist.h | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h index cbe5956493..3542577ae3 100644 --- a/indra/newview/llavatarlist.h +++ b/indra/newview/llavatarlist.h @@ -84,6 +84,9 @@ public: bool getIconsVisible() const { return mShowIcons; } const std::string getIconParamName() const{return mIconParamName;} virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); + /*virtual*/ BOOL handleMouseDown( S32 x, S32 y, MASK mask ); + /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask); + /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); // Return true if filter has at least one match. bool filterHasMatches(); @@ -97,12 +100,10 @@ public: void addAvalineItem(const LLUUID& item_id, const LLUUID& session_id, const std::string& item_name); void handleDisplayNamesOptionChanged(); - - protected: - virtual void refresh(); - virtual void addNewItem(const LLUUID& id, const std::string& name, BOOL is_online, EAddPosition pos = ADD_BOTTOM); - + void refresh(); + + void addNewItem(const LLUUID& id, const std::string& name, BOOL is_online, EAddPosition pos = ADD_BOTTOM); void computeDifference( const uuid_vec_t& vnew, uuid_vec_t& vadded, @@ -112,6 +113,8 @@ protected: void onItemDoubleClicked(LLUICtrl* ctrl, S32 x, S32 y, MASK mask); void updateAvatarNames(); +private: + bool isAvalineItemSelected(); bool mIgnoreOnlineStatus; @@ -205,21 +208,4 @@ private: bool mIsHideNumber; }; -class LLAvatarListSocial : public LLAvatarList -{ - public: - struct Params : public LLInitParam::Block<Params, LLAvatarList::Params> - { - - }; - - LLAvatarListSocial(const Params&); - - void addSocialItem(const LLUUID& id, const std::string& name, BOOL is_online, EAddPosition pos = ADD_BOTTOM); - - protected: - /*virtual*/ void refresh(); -}; - - #endif // LL_LLAVATARLIST_H |