summaryrefslogtreecommitdiff
path: root/indra/llmessage/llavatarname.h
diff options
context:
space:
mode:
authorpavelkproductengine <pavelkproductengine@lindenlab.com>2016-08-16 20:40:57 +0300
committerpavelkproductengine <pavelkproductengine@lindenlab.com>2016-08-16 20:40:57 +0300
commit05e77c5f261f2620519dfc6eda845307849308a7 (patch)
tree5c607f3e30a4f14070ec0efc84628ec654aaa3a7 /indra/llmessage/llavatarname.h
parentb496e4ff156ab2fb055e741b97ceda5751476e7f (diff)
parent4fb100ac7a33174883184f1320d0beac08ead3a7 (diff)
Merge VOB with 4.0.8-release
Diffstat (limited to 'indra/llmessage/llavatarname.h')
-rw-r--r--indra/llmessage/llavatarname.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llavatarname.h b/indra/llmessage/llavatarname.h
index 1cb3ae421f..192f43f07c 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() const;
+ std::string getCompleteName(bool use_parentheses = true) const;
// Returns "James Linden" or "bobsmith123 Resident" for backwards
// compatibility with systems like voice and muting
@@ -80,7 +80,7 @@ public:
// Returns "James Linden" or "bobsmith123 Resident"
// Used where we explicitely prefer or need a non UTF-8 legacy (ASCII) name
// Also used for backwards compatibility with systems like voice and muting
- std::string getUserName() const;
+ std::string getUserName(bool lowercase = false) const;
// Returns "james.linden" or the legacy name for very old names
std::string getAccountName() const { return mUsername; }