diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index 3d15f8288ffb37144fc77a48ad037fde05970043..fd0359368d28fb4e370b5a8be6f5dd8ecabdb538 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -45,6 +45,7 @@ #include "llscrolllistcolumn.h" #include "llsdparam.h" #include "lltooltip.h" +#include "lltrans.h" static LLDefaultChildRegistry::Register<LLNameListCtrl> r("name_list"); @@ -301,7 +302,11 @@ LLScrollListItem* LLNameListCtrl::addNameItemRow( case INDIVIDUAL: { LLAvatarName av_name; - if (LLAvatarNameCache::get(id, &av_name)) + if (id.isNull()) + { + fullname = LLTrans::getString("AvatarNameNobody"); + } + else if (LLAvatarNameCache::get(id, &av_name)) { if (mShortNames) fullname = av_name.mDisplayName;