diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-04-04 15:57:35 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-04-04 15:57:35 -0700 |
| commit | 38ea63e084362d01deedf07e617b6e2bf85bbb25 (patch) | |
| tree | efaa6b41c40f4f6e4096c31e473ec1d68b3de4d2 /indra/newview/llsociallist.cpp | |
| parent | 819bbce34a2f265287df1e4e9adde90b5a70c8b6 (diff) | |
| parent | dabce05d1eed47944e39438e50b3c788b7df649d (diff) | |
merging in viewer-chui
Diffstat (limited to 'indra/newview/llsociallist.cpp')
| -rw-r--r-- | indra/newview/llsociallist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsociallist.cpp b/indra/newview/llsociallist.cpp index 6cf0851fd7..bcf6d5a63c 100644 --- a/indra/newview/llsociallist.cpp +++ b/indra/newview/llsociallist.cpp @@ -72,7 +72,7 @@ void LLSocialList::addNewItem(const LLUUID& id, const std::string& name, BOOL is item->mIcon->setValue(id); } - item->setName(has_avatar_name ? name + " (" + avatar_name.mDisplayName + ")" : name, mNameFilter); + item->setName(has_avatar_name ? name + " (" + avatar_name.getDisplayName() + ")" : name, mNameFilter); addItem(item, id, pos); } |