diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-01-11 13:52:40 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-01-11 13:52:40 +0200 |
| commit | 2f40972dd84560de26a9d2dcaaff377e15c1de37 (patch) | |
| tree | eb64d76933dc32637c367cc1c951ffa09bf15d30 /indra/llmessage/llavatarname.cpp | |
| parent | 13f8f5dd3060388ee1814246722bba17ccea62b4 (diff) | |
MAINT-7031 /displayname & /completename should perform regardless of "View Display Names" viewer setting.
Diffstat (limited to 'indra/llmessage/llavatarname.cpp')
| -rw-r--r-- | indra/llmessage/llavatarname.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llmessage/llavatarname.cpp b/indra/llmessage/llavatarname.cpp index d2115ee499..2e8886fb51 100644 --- a/indra/llmessage/llavatarname.cpp +++ b/indra/llmessage/llavatarname.cpp @@ -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; } |