From e97f7728a90dd66014f6b3f0cd5e8d4c71f48691 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 30 Jul 2009 23:22:41 +0000
Subject: 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

---
 indra/newview/llavatarlist.h | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llavatarlist.h')

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
-- 
cgit v1.2.3