diff options
author | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
commit | cd17687f01420952712a500107e0f93e7ab8d5f8 (patch) | |
tree | ce48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/llnamebox.cpp | |
parent | Second Life viewer sources 1.19.0.5 (diff) | |
download | meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2 meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz |
Second Life viewer sources 1.19.1.0
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llnamebox.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/linden/indra/newview/llnamebox.cpp b/linden/indra/newview/llnamebox.cpp index 9f141b8..5a164b4 100644 --- a/linden/indra/newview/llnamebox.cpp +++ b/linden/indra/newview/llnamebox.cpp | |||
@@ -70,24 +70,15 @@ void LLNameBox::setNameID(const LLUUID& name_id, BOOL is_group) | |||
70 | { | 70 | { |
71 | mNameID = name_id; | 71 | mNameID = name_id; |
72 | 72 | ||
73 | char first[DB_FIRST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/ | 73 | std::string name; |
74 | char last[DB_LAST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/ | ||
75 | char group_name[DB_GROUP_NAME_BUF_SIZE]; /*Flawfinder: ignore*/ | ||
76 | LLString name; | ||
77 | 74 | ||
78 | if (!is_group) | 75 | if (!is_group) |
79 | { | 76 | { |
80 | gCacheName->getName(name_id, first, last); | 77 | gCacheName->getFullName(name_id, name); |
81 | |||
82 | name.assign(first); | ||
83 | name.append(1, ' '); | ||
84 | name.append(last); | ||
85 | } | 78 | } |
86 | else | 79 | else |
87 | { | 80 | { |
88 | gCacheName->getGroupName(name_id, group_name); | 81 | gCacheName->getGroupName(name_id, name); |
89 | |||
90 | name.assign(group_name); | ||
91 | } | 82 | } |
92 | 83 | ||
93 | setText(name); | 84 | setText(name); |