From cf8a16366ab764ceb02bfe013a40f731812e727c Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Thu, 6 Jan 2011 13:41:04 -0800
Subject: [PATCH] SOCIAL-423 FIX Display name and username are wrong in My
Profile tab
---
indra/newview/llpanelavatar.cpp | 13 ++++++++++++-
.../skins/default/xui/en/panel_my_profile.xml | 4 ++--
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 54e1fd8fbf2..94b2340c937 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -628,7 +628,18 @@ void LLPanelAvatarProfile::processGroupProperties(const LLAvatarGroups* avatar_g
void LLPanelAvatarProfile::got_full_name_callback( const LLUUID& id, const std::string& full_name, bool is_group )
{
LLStringUtil::format_map_t args;
- args["[NAME]"] = full_name;
+
+ std::string name;
+ if (LLAvatarNameCache::useDisplayNames())
+ {
+ name = LLCacheName::buildUsername(full_name);
+ }
+ else
+ {
+ name = full_name;
+ }
+
+ args["[NAME]"] = name;
std::string linden_name = getString("name_text_args", args);
getChild<LLUICtrl>("name_descr_text")->setValue(linden_name);
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index fa39eaf3edd..4bd2235cdae 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -108,7 +108,7 @@
height="15"
layout="topleft"
left_pad="10"
- name="name_descr_text"
+ name="display_name_descr_text"
text_color="0.7 0.7 0.7 1.0"
top_delta="0"
width="280" >
@@ -121,7 +121,7 @@
height="15"
layout="topleft"
left_delta="0"
- name="display_name_descr_text"
+ name="name_descr_text"
text_color="0.4 0.4 0.4 1.0"
top_delta="20"
width="280">
--
GitLab