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

FIRE-716, When showing displayname/username , only show username if display name != legacy name, by Ansariel Hiller

Arrehn 2011-04-17 23:12:01 -04:00
parent 52f4999ecb
commit 9baa80eb6a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llcommon/llavatarname.cpp
View File

@ -90,14 +90,16 @@ void LLAvatarName::fromLLSD(const LLSD& sd)
std::string LLAvatarName::getCompleteName() const
{
std::string name;
if (!mUsername.empty())
if (mUsername.empty() || mIsDisplayNameDefault)
// If the display name feature is off
// OR this particular display name is defaulted (i.e. based on user name),
// then display only the easier to read instance of the person's name.
{
name = mDisplayName + " (" + mUsername + ")";
name = mDisplayName;
}
else
{
// ...display names are off, legacy name is in mDisplayName
name = mDisplayName;
name = mDisplayName + " (" + mUsername + ")";
}
return name;
}

2
indra/newview/llchathistory.cpp
View File

@ -717,7 +717,7 @@ void LLChatHistory::clear()
void LLChatHistory::onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name)
{
mDisplayName = av_name.mDisplayName;
mDisplayName_Username = mDisplayName + " ("+av_name.mUsername+")";
mDisplayName_Username = av_name.getCompleteName();
}
//-TT Display names timing in chat