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

FIRE-2266, part 2, DN fixes by Selo Jacobus

meow-7.2.2
Arrehn 2011-08-22 16:23:37 -04:00
parent 689e3f7a4d
commit 40f9688e72
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llpanelprofileview.cpp
View File

@ -283,8 +283,15 @@ void LLPanelProfileView::onAvatarNameCache(const LLUUID& agent_id,
getChild<LLUICtrl>("user_name")->setValue( av_name.mUsername );
getChild<LLUICtrl>("user_key")->setValue( agent_id.asString() );
getChild<LLUICtrl>("copy_uri")->setEnabled( true );
//[ADD: FIRE-2266: SJ] make sure username is always filled even when Displaynames are not enabled
std::string username = av_name.mUsername;
if (username.empty())
{
username = LLCacheName::buildUsername(av_name.mDisplayName);
}
//[ADD: FIRE-2266: SJ] Adding link to webprofiles on profile which opens Web Profiles in browser
getChild<LLUICtrl>("web_profile_text")->setValue( "https://my.secondlife.com/" + av_name.mUsername );
getChild<LLUICtrl>("web_profile_text")->setValue( "https://my.secondlife.com/" + username );
#if 0
getChild<LLUICtrl>("user_name")->setValue( av_name.mDisplayName );