From 3a37588a4f6f918c3cbec826ccd86c607fc0c797 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 1 Jun 2010 11:22:42 -0700
Subject: DEV-50439 Legacy name shown in Title of Voice Call dialog

Wasn't updating window title with correct name.  Also fixed
outgoing call dialog.  Reviewed with Simon.
---
 indra/newview/llcallfloater.h | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h
index 0a8ea7de39..4ec594a23a 100644
--- a/indra/newview/llcallfloater.h
+++ b/indra/newview/llcallfloater.h
@@ -40,6 +40,7 @@
 
 class LLAvatarList;
 class LLAvatarListItem;
+class LLAvatarName;
 class LLNonAvatarCaller;
 class LLOutputMonitorCtrl;
 class LLParticipantList;
@@ -122,6 +123,10 @@ private:
 	 */
 	void onAvatarListRefreshed();
 
+	/**
+	 * Updates window title with an avatar name
+	 */
+	void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name);
 	
 	void updateTitle();
 	void initAgentData();
-- 
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/llcallfloater.h | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h
index cb4d175eb9..3bc7043353 100644
--- a/indra/newview/llcallfloater.h
+++ b/indra/newview/llcallfloater.h
@@ -126,6 +126,7 @@ private:
 	void initAgentData();
 	void setModeratorMutedVoice(bool moderator_muted);
 	void updateAgentModeratorState();
+	void onModeratorNameCache(const LLAvatarName& av_name);
 
 	/**
 	 * Sets initial participants voice states in avatar list (Invited, Joined, Has Left).
-- 
cgit v1.2.3