livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SOCIAL-423 FIX Display name and username are wrong in My Profile tab

master
callum 2011-01-06 13:41:04 -08:00
parent 8d2c4369da
commit cf8a16366a
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llpanelavatar.cpp
View File

@ -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);

4
indra/newview/skins/default/xui/en/panel_my_profile.xml
View File

@ -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">