diff options
Diffstat (limited to 'linden/indra/llcommon/llavatarname.h')
-rw-r--r-- | linden/indra/llcommon/llavatarname.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/linden/indra/llcommon/llavatarname.h b/linden/indra/llcommon/llavatarname.h index 3b6c6ea..1e141dc 100644 --- a/linden/indra/llcommon/llavatarname.h +++ b/linden/indra/llcommon/llavatarname.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /** | 1 | /** |
2 | * @file llavatarname.h | 2 | * @file llavatarname.h |
3 | * @brief Represents name-related data for an avatar, such as the | 3 | * @brief Represents name-related data for an avatar, such as the |
4 | * username/SLID ("bobsmith123" or "james.linden") and the display | 4 | * username/SLID ("bobsmith123" or "james.green") and the display |
5 | * name ("James Cook") | 5 | * name ("James Cook") |
6 | * | 6 | * |
7 | * $LicenseInfo:firstyear=2010&license=viewerlgpl$ | 7 | * $LicenseInfo:firstyear=2010&license=viewerlgpl$ |
@@ -43,8 +43,8 @@ public: | |||
43 | 43 | ||
44 | void fromLLSD(const LLSD& sd); | 44 | void fromLLSD(const LLSD& sd); |
45 | 45 | ||
46 | // For normal names, returns "James Linden (james.linden)" | 46 | // For normal names, returns "James Green (james.green)" |
47 | // When display names are disabled returns just "James Linden" | 47 | // When display names are disabled returns just "James Green" |
48 | std::string getCompleteName() const; | 48 | std::string getCompleteName() const; |
49 | 49 | ||
50 | // For normal names, returns "Whatever Display Name (John Doe)" when | 50 | // For normal names, returns "Whatever Display Name (John Doe)" when |
@@ -55,31 +55,31 @@ public: | |||
55 | // line feed. | 55 | // line feed. |
56 | std::string getNames(bool linefeed = false) const; | 56 | std::string getNames(bool linefeed = false) const; |
57 | 57 | ||
58 | // Returns "James Linden" or "bobsmith123 Resident" for backwards | 58 | // Returns "James Green" or "bobsmith123 Resident" for backwards |
59 | // compatibility with systems like voice and muting | 59 | // compatibility with systems like voice and muting |
60 | std::string getLegacyName() const; | 60 | std::string getLegacyName() const; |
61 | 61 | ||
62 | // "bobsmith123" or "james.linden", US-ASCII only | 62 | // "bobsmith123" or "james.green", US-ASCII only |
63 | std::string mUsername; | 63 | std::string mUsername; |
64 | 64 | ||
65 | // "Jose' Sanchez" or "James Linden", UTF-8 encoded Unicode | 65 | // "Jose' Sanchez" or "James Green", UTF-8 encoded Unicode |
66 | // Contains data whether or not user has explicitly set | 66 | // Contains data whether or not user has explicitly set |
67 | // a display name; may duplicate their username. | 67 | // a display name; may duplicate their username. |
68 | std::string mDisplayName; | 68 | std::string mDisplayName; |
69 | 69 | ||
70 | // For "James Linden", "James" | 70 | // For "James Green", "James" |
71 | // For "bobsmith123", "bobsmith123" | 71 | // For "bobsmith123", "bobsmith123" |
72 | // Used to communicate with legacy systems like voice and muting which | 72 | // Used to communicate with legacy systems like voice and muting which |
73 | // rely on old-style names. | 73 | // rely on old-style names. |
74 | std::string mLegacyFirstName; | 74 | std::string mLegacyFirstName; |
75 | 75 | ||
76 | // For "James Linden", "Linden" | 76 | // For "James Green", "Green" |
77 | // For "bobsmith123", "Resident" | 77 | // For "bobsmith123", "Resident" |
78 | // see above for rationale | 78 | // see above for rationale |
79 | std::string mLegacyLastName; | 79 | std::string mLegacyLastName; |
80 | 80 | ||
81 | // If true, both display name and SLID were generated from | 81 | // If true, both display name and SLID were generated from |
82 | // a legacy first and last name, like "James Linden (james.linden)" | 82 | // a legacy first and last name, like "James Green (james.green)" |
83 | bool mIsDisplayNameDefault; | 83 | bool mIsDisplayNameDefault; |
84 | 84 | ||
85 | // Under error conditions, we may insert "dummy" records with | 85 | // Under error conditions, we may insert "dummy" records with |