summaryrefslogtreecommitdiff
path: root/indra/llcommon/llavatarname.h
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-05-01 08:11:15 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-05-01 08:11:15 -0700
commit025c8909582f59f68f786d52bea06f5a272df0b5 (patch)
tree6d9980e216f89c74776155432b32e6778f3b6367 /indra/llcommon/llavatarname.h
parent536a30d7f2083d39dbd6d06f16fa53064c3ee379 (diff)
parent70c1e21956b8589c9873ac5fa6a05467dc2e0a89 (diff)
Merge vwr-dev-mat
Diffstat (limited to 'indra/llcommon/llavatarname.h')
-rwxr-xr-xindra/llcommon/llavatarname.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llavatarname.h b/indra/llcommon/llavatarname.h
index 7542a8dece..5d2fccc5ba 100755
--- a/indra/llcommon/llavatarname.h
+++ b/indra/llcommon/llavatarname.h
@@ -63,7 +63,7 @@ public:
// For normal names, returns "James Linden (james.linden)"
// When display names are disabled returns just "James Linden"
std::string getCompleteName() const;
-
+
// Returns "James Linden" or "bobsmith123 Resident" for backwards
// compatibility with systems like voice and muting
// *TODO: Eliminate this in favor of username only