diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-17 19:29:35 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-17 19:29:35 -0800 |
| commit | 3d137bae5c5435dde305323179d8d3d6c9720bad (patch) | |
| tree | 959fe5ab17e21ab6d4455da7f7173270f8d01732 /indra/newview/llpanelgroupinvite.cpp | |
| parent | 6fe7144104cd8b5bd9c7d215f76afdeafe13b7ee (diff) | |
| parent | f8b51f40289255ce38f65830f5bb0f29def3b757 (diff) | |
Merge with viewer-chui
Diffstat (limited to 'indra/newview/llpanelgroupinvite.cpp')
| -rw-r--r-- | indra/newview/llpanelgroupinvite.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp index 1951a96c54..77d74a5d1a 100644 --- a/indra/newview/llpanelgroupinvite.cpp +++ b/indra/newview/llpanelgroupinvite.cpp @@ -504,7 +504,7 @@ void LLPanelGroupInvite::addUsers(uuid_vec_t& agent_ids) } else { - names.push_back(av_name.getUserName()); + names.push_back(av_name.getAccountName()); } } } @@ -517,7 +517,7 @@ void LLPanelGroupInvite::addUserCallback(const LLUUID& id, const LLAvatarName& a std::vector<std::string> names; uuid_vec_t agent_ids; agent_ids.push_back(id); - names.push_back(av_name.getUserName()); + names.push_back(av_name.getAccountName()); mImplementation->addUsers(names, agent_ids); } |