diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-12-17 14:16:47 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-12-17 14:16:47 -0800 |
| commit | 09163617c2c5e79d8e51b5ceca5b5282effcb1f6 (patch) | |
| tree | 00ca15b9d3f3c336ac357413c38f87028ba4e1ee /indra/newview/llpanelgroupinvite.cpp | |
| parent | e8bff548ff7374c263c2bc38a337e8841bc2761f (diff) | |
| parent | ed52792396c76ead787207b7a7dc3968f4352a1d (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/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 a2bbc5400c..3f0c6c4613 100644 --- a/indra/newview/llpanelgroupinvite.cpp +++ b/indra/newview/llpanelgroupinvite.cpp @@ -482,7 +482,7 @@ void LLPanelGroupInvite::addUsers(uuid_vec_t& agent_ids) } else { - names.push_back(av_name.getUserName()); + names.push_back(av_name.getAccountName()); } } } @@ -495,7 +495,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); } |