diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llnamelistctrl.cpp | 7 | 
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index 3d15f8288f..fd0359368d 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;  | 
