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

MAINT-7031 /displayname & /completename should perform regardless of "View Display Names" viewer setting.

Mnikolenko Productengine 2017-01-11 13:52:40 +02:00
parent 13f8f5dd30
commit 2f40972dd8
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llmessage/llavatarname.cpp
View File

@ -166,10 +166,10 @@ void LLAvatarName::setExpires(F64 expires)
mExpires = LLFrameTimer::getTotalSeconds() + expires;
}
std::string LLAvatarName::getCompleteName(bool use_parentheses) const
std::string LLAvatarName::getCompleteName(bool use_parentheses, bool force_use_display_name) const
{
std::string name;
if (sUseDisplayNames)
if (sUseDisplayNames || force_use_display_name)
{
if (mUsername.empty() || mIsDisplayNameDefault)
{
@ -215,9 +215,9 @@ std::string LLAvatarName::getLegacyName() const
return name;
}
std::string LLAvatarName::getDisplayName() const
std::string LLAvatarName::getDisplayName(bool force_use_display_name) const
{
if (sUseDisplayNames)
if (sUseDisplayNames || force_use_display_name)
{
return mDisplayName;
}

4
indra/llmessage/llavatarname.h
View File

@ -65,7 +65,7 @@ public:
// For normal names, returns "James Linden (james.linden)"
// When display names are disabled returns just "James Linden"
std::string getCompleteName(bool use_parentheses = true) const;
std::string getCompleteName(bool use_parentheses = true, bool force_use_display_name = false) const;
// Returns "James Linden" or "bobsmith123 Resident" for backwards
// compatibility with systems like voice and muting
@ -75,7 +75,7 @@ public:
// "José Sanchez" or "James Linden", UTF-8 encoded Unicode
// Takes the display name preference into account. This is truly the name that should
// be used for all UI where an avatar name has to be used unless we truly want something else (rare)
std::string getDisplayName() const;
std::string getDisplayName(bool force_use_display_name = false) const;
// Returns "James Linden" or "bobsmith123 Resident"
// Used where we explicitely prefer or need a non UTF-8 legacy (ASCII) name

4
indra/llui/llurlentry.cpp
View File

@ -764,7 +764,7 @@ LLUrlEntryAgentCompleteName::LLUrlEntryAgentCompleteName()
std::string LLUrlEntryAgentCompleteName::getName(const LLAvatarName& avatar_name)
{
return avatar_name.getCompleteName();
return avatar_name.getCompleteName(true, true);
}
//
@ -780,7 +780,7 @@ LLUrlEntryAgentDisplayName::LLUrlEntryAgentDisplayName()
std::string LLUrlEntryAgentDisplayName::getName(const LLAvatarName& avatar_name)
{
return avatar_name.getDisplayName();
return avatar_name.getDisplayName(true);
}
//