From b2274765dade87417f5b526c8b72f353ba6f4898 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 25 May 2010 14:48:55 -0700
Subject: DEV-50013 Group chat moderator tooltip shows username

---
 indra/newview/llavatarlist.h | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h
index a9320055ca..81b5b2b212 100644
--- a/indra/newview/llavatarlist.h
+++ b/indra/newview/llavatarlist.h
@@ -34,7 +34,6 @@
 #define LL_LLAVATARLIST_H
 
 #include "llflatlistview.h"
-
 #include "llavatarlistitem.h"
 
 class LLTimer;
-- 
cgit v1.2.3


From a923da7fc78b44cd5368d26652b0204322f064a4 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 13 Sep 2010 14:59:31 -0700
Subject: DEV-52931 Toggling "View Display Names" doesn't take effect right
 away in the Friends list

---
 indra/newview/llavatarlist.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h
index 48bc76828e..0d34dce6d8 100644
--- a/indra/newview/llavatarlist.h
+++ b/indra/newview/llavatarlist.h
@@ -93,6 +93,7 @@ public:
 	virtual S32 notifyParent(const LLSD& info);
 
 	void addAvalineItem(const LLUUID& item_id, const LLUUID& session_id, const std::string& item_name);
+	void handleDisplayNamesOptionChanged();
 
 protected:
 	void refresh();
@@ -102,14 +103,17 @@ protected:
 		const uuid_vec_t& vnew,
 		uuid_vec_t& vadded,
 		uuid_vec_t& vremoved);
-	void updateLastInteractionTimes();
+	void updateLastInteractionTimes();	
+	void rebuildNames();
 	void onItemDoubleClicked(LLUICtrl* ctrl, S32 x, S32 y, MASK mask);
+	void updateAvatarNames();
 
 private:
 
 	bool mIgnoreOnlineStatus;
 	bool mShowLastInteractionTime;
 	bool mDirty;
+	bool mNeedUpdateNames;
 	bool mShowIcons;
 	bool mShowInfoBtn;
 	bool mShowProfileBtn;
-- 
cgit v1.2.3