From 3791745054546dbebb3373371aaf7a0ddad608a3 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 22 Feb 2010 16:41:56 -0800
Subject: Simple button to change your display name Talks to web service so
 other people can see the change, but for now they need to relog or toggle
 display names on/off to clear their cache.

---
 indra/newview/llpanelme.h | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/llpanelme.h b/indra/newview/llpanelme.h
index 1325192bbf..368fdb307a 100644
--- a/indra/newview/llpanelme.h
+++ b/indra/newview/llpanelme.h
@@ -95,6 +95,7 @@ private:
 	void initTexturePickerMouseEvents();
 	void onTexturePickerMouseEnter(LLUICtrl* ctrl);
 	void onTexturePickerMouseLeave(LLUICtrl* ctrl);
+	void onClickSetName();
 
 	/**
 	 * Enabled/disables controls to prevent overwriting edited data upon receiving
-- 
cgit v1.2.3


From f3e0e9a5264a80d146a1d4d77fd9c4f5d3070278 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 24 Feb 2010 14:31:46 -0800
Subject: Hack to refresh name tags when I change my display name. Also fixes a
 crash when turning on display names.

---
 indra/newview/llpanelme.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/llpanelme.h b/indra/newview/llpanelme.h
index 368fdb307a..ed630133ca 100644
--- a/indra/newview/llpanelme.h
+++ b/indra/newview/llpanelme.h
@@ -34,7 +34,7 @@
 #define LL_LLPANELMEPROFILE_H
 
 #include "llpanel.h"
-#include "llpanelavatar.h"
+#include "llpanelprofile.h"
 
 class LLPanelMyProfileEdit;
 class LLPanelProfile;
@@ -96,6 +96,7 @@ private:
 	void onTexturePickerMouseEnter(LLUICtrl* ctrl);
 	void onTexturePickerMouseLeave(LLUICtrl* ctrl);
 	void onClickSetName();
+	void callbackSetName(const LLSD& notification, const LLSD& response);
 
 	/**
 	 * Enabled/disables controls to prevent overwriting edited data upon receiving
-- 
cgit v1.2.3


From 639b234762133e4d09d6d7b1bac9d25c5a681926 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Thu, 18 Mar 2010 17:19:57 -0700
Subject: Partial support for Set Name returning error msg from service

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

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

diff --git a/indra/newview/llpanelme.h b/indra/newview/llpanelme.h
index ed630133ca..9304bc1d82 100644
--- a/indra/newview/llpanelme.h
+++ b/indra/newview/llpanelme.h
@@ -36,6 +36,7 @@
 #include "llpanel.h"
 #include "llpanelprofile.h"
 
+class LLAvatarName;
 class LLPanelMyProfileEdit;
 class LLPanelProfile;
 class LLIconCtrl;
@@ -90,13 +91,15 @@ protected:
 	/*virtual*/void resetData();
 
 	void processProfileProperties(const LLAvatarData* avatar_data);
+	void onNameCache(const LLUUID& agent_id, const LLAvatarName& av_name);
 
 private:
 	void initTexturePickerMouseEvents();
 	void onTexturePickerMouseEnter(LLUICtrl* ctrl);
 	void onTexturePickerMouseLeave(LLUICtrl* ctrl);
 	void onClickSetName();
-	void callbackSetName(const LLSD& notification, const LLSD& response);
+	void onDialogSetName(const LLSD& notification, const LLSD& response);
+	void onCacheSetName(bool success, const std::string& reason, const LLSD& content);
 
 	/**
 	 * Enabled/disables controls to prevent overwriting edited data upon receiving
-- 
cgit v1.2.3


From 650171af1788435e200c62965c3ffe314d2082db Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 19 Aug 2010 14:20:49 -0700
Subject: DEV-51021 Viewer returns misleading error message when a blocked user
 attempts to change his display name

---
 indra/newview/llpanelme.h | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/indra/newview/llpanelme.h b/indra/newview/llpanelme.h
index f3caf026dc..be292002cf 100644
--- a/indra/newview/llpanelme.h
+++ b/indra/newview/llpanelme.h
@@ -99,6 +99,7 @@ private:
 	void onClickSetName();
 	void onDialogSetName(const LLSD& notification, const LLSD& response);
 	void onCacheSetName(bool success, const std::string& reason, const LLSD& content);
+	void onAvatarNameCache(const LLUUID& id, const LLAvatarName& av_name);
 
 	/**
 	 * Enabled/disables controls to prevent overwriting edited data upon receiving
@@ -106,6 +107,8 @@ private:
 	 */
 	void enableEditing(bool enable);
 
+
+
 private:
 	// map TexturePicker name => Edit Icon pointer should be visible while hovering Texture Picker
 	typedef std::map<std::string, LLIconCtrl*> texture_edit_icon_map_t;
-- 
cgit v1.2.3


From 7ffc9b06c820d70724af2aef361ff9964e584e73 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Fri, 8 Oct 2010 16:56:02 -0700
Subject: Created a floater for setting display name

---
 indra/newview/llpanelme.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/llpanelme.h b/indra/newview/llpanelme.h
index 93264922f6..d5b2fee869 100644
--- a/indra/newview/llpanelme.h
+++ b/indra/newview/llpanelme.h
@@ -78,6 +78,9 @@ public:
 	/*virtual*/BOOL postBuild();
 
 	/*virtual*/ void onOpen(const LLSD& key);
+	/*virtual*/ void onClose(const LLSD& key);
+
+	void onAvatarNameChanged();
 
 protected:	
 
@@ -91,8 +94,6 @@ private:
 	void onTexturePickerMouseEnter(LLUICtrl* ctrl);
 	void onTexturePickerMouseLeave(LLUICtrl* ctrl);
 	void onClickSetName();
-	void onDialogSetName(const LLSD& notification, const LLSD& response);
-	void onCacheSetName(bool success, const std::string& reason, const LLSD& content);
 	void onAvatarNameCache(const LLUUID& id, const LLAvatarName& av_name);
 
 	/**
-- 
cgit v1.2.3