diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-02-07 12:56:45 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-02-07 12:56:45 +0200 |
| commit | e138ca5e78cb9fe095a6d67a28a39a1608d38653 (patch) | |
| tree | 061db115013195d69f5991f6908c261e5c18533f | |
| parent | 09c063947c5a7d6a6e1abd035b203eac671c68ff (diff) | |
MAINT-7112 FIXED URI namespace /completename is still affected by the Usernames viewer setting.
| -rw-r--r-- | indra/llmessage/llavatarname.cpp | 6 | ||||
| -rw-r--r-- | indra/llmessage/llavatarname.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/llmessage/llavatarname.cpp b/indra/llmessage/llavatarname.cpp index 2e8886fb51..7e1246f885 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, bool force_use_display_name) const +std::string LLAvatarName::getCompleteName(bool use_parentheses, bool force_use_complete_name) const { std::string name; - if (sUseDisplayNames || force_use_display_name) + if (sUseDisplayNames || force_use_complete_name) { if (mUsername.empty() || mIsDisplayNameDefault) { @@ -180,7 +180,7 @@ std::string LLAvatarName::getCompleteName(bool use_parentheses, bool force_use_d else { name = mDisplayName; - if(sUseUsernames) + if(sUseUsernames || force_use_complete_name) { if(use_parentheses) { diff --git a/indra/llmessage/llavatarname.h b/indra/llmessage/llavatarname.h index 80b54cded9..20f7140797 100644 --- a/indra/llmessage/llavatarname.h +++ b/indra/llmessage/llavatarname.h @@ -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, bool force_use_display_name = false) const; + std::string getCompleteName(bool use_parentheses = true, bool force_use_complete_name = false) const; // Returns "James Linden" or "bobsmith123 Resident" for backwards // compatibility with systems like voice and muting |