diff options
author | Cinder Roxley <cinder.roxley@phoenixviewer.com> | 2013-06-27 21:22:44 -0600 |
---|---|---|
committer | Cinder Roxley <cinder.roxley@phoenixviewer.com> | 2013-06-27 21:22:44 -0600 |
commit | 7e0bc07e5cd72cfb7c55c964a73d9d8c9e9e5988 (patch) | |
tree | e847d23a8642323ef63df22a9426f1524d4da796 /indra/llcommon/llavatarname.h | |
parent | 4f7b8a7e861ee25f1e0f7b0df2e9c8372254f46d (diff) | |
parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) |
Merged lindenlab/viewer-release into default
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 |