diff options
| author | callum <none@none> | 2011-01-06 13:41:04 -0800 |
|---|---|---|
| committer | callum <none@none> | 2011-01-06 13:41:04 -0800 |
| commit | cf8a16366ab764ceb02bfe013a40f731812e727c (patch) | |
| tree | e3441c739e7d0674e7018aa7f5052d495454772c /indra/newview | |
| parent | 8d2c4369dadc59e83a759f8e5fd62e823ca36a23 (diff) | |
SOCIAL-423 FIX Display name and username are wrong in My Profile tab
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelavatar.cpp | 13 | ||||
| -rw-r--r-- | indra/newview/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 54e1fd8fbf..94b2340c93 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 fa39eaf3ed..4bd2235cda 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"> |