diff options
author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-06-20 16:40:43 -0700 |
---|---|---|
committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-06-20 16:40:43 -0700 |
commit | 988eae369882f57eeb4bca893dcc2c46eb773ec7 (patch) | |
tree | 8518e405fceeff8a0593329c1a0d335a30b79031 /indra/llcommon/llavatarname.h | |
parent | 50bb863be1c0e3528fd850aac812fc6196a7c4fc (diff) | |
parent | 7da4c651911743707c0cc7cd4bebdcefb52eb379 (diff) |
merge
Diffstat (limited to 'indra/llcommon/llavatarname.h')
-rwxr-xr-x | indra/llcommon/llavatarname.h | 2 |
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 |