diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-25 14:22:56 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-25 14:22:56 -0700 |
| commit | 16e3d7ebf56731c5e9ff40b92eff427316c65103 (patch) | |
| tree | 62552614f1314f4d3bb96ef133b9659bdae89e16 /indra/newview/llnamelistctrl.cpp | |
| parent | 1bd6061ff57a46293d962adf8ffa5326f87a3566 (diff) | |
| parent | a91d10dc1806d1931c7f1361bfcf70df59d982d5 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llnamelistctrl.cpp')
| -rw-r--r-- | indra/newview/llnamelistctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index 2a7e84256e..a2450fcdd2 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -306,7 +306,7 @@ LLScrollListItem* LLNameListCtrl::addNameItemRow( if (mShortNames) fullname = av_name.mDisplayName; else - fullname = av_name.getNameAndSLID(); + fullname = av_name.getCompleteName(); } else { @@ -375,7 +375,7 @@ void LLNameListCtrl::onAvatarNameCache(const LLUUID& agent_id, if (mShortNames) name = av_name.mDisplayName; else - name = av_name.getNameAndSLID(); + name = av_name.getCompleteName(); item_list::iterator iter; for (iter = getItemList().begin(); iter != getItemList().end(); iter++) |