diff options
author | Steven Bennetts <steve@lindenlab.com> | 2009-07-30 23:22:41 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-30 23:22:41 +0000 |
commit | e97f7728a90dd66014f6b3f0cd5e8d4c71f48691 (patch) | |
tree | 4be178df6b50a3395105cdd3ac0044d6467a9fa3 /indra/newview/llavatarlist.h | |
parent | d5aa10143a0e6457b3326ba839c81b7c956a015e (diff) |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llavatarlist.h')
-rw-r--r-- | indra/newview/llavatarlist.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h index 9dba719fee..8b419dbb57 100644 --- a/indra/newview/llavatarlist.h +++ b/indra/newview/llavatarlist.h @@ -42,23 +42,37 @@ class LLAvatarList : public LLScrollListCtrl public: struct Params : public LLInitParam::Block<Params, LLScrollListCtrl::Params> { + Optional<S32> volume_column_width; + Optional<bool> online_go_first; Params(); }; - enum AVATAR_LIST_COLUMN_ORDER + enum EColumnOrder { - LIST_NAME, + COL_VOLUME, + COL_NAME, + COL_ONLINE, + COL_ID, }; LLAvatarList(const Params&); virtual ~LLAvatarList() {} + /*virtual*/ void draw(); + BOOL update(const std::vector<LLUUID>& all_buddies, const std::string& name_filter = LLStringUtil::null); protected: std::vector<LLUUID> getSelectedIDs(); void addItem(const LLUUID& id, const std::string& name, BOOL is_bold, EAddPosition pos = ADD_BOTTOM); + +private: + static std::string getVolumeIcon(const LLUUID& id); /// determine volume icon from current avatar volume + void updateVolume(); // update volume for all avatars + + bool mHaveVolumeColumn; + bool mOnlineGoFirst; }; #endif // LL_LLAVATARLIST_H |