summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-07-21 16:59:18 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-07-21 16:59:18 -0700
commit9b5004a72d9726a0f7372faf16218f2edadc875d (patch)
treed543bf43273cc3bc9b3b45d2fa969f855aff214e
parent2278db1b41649f7ba2a60461585792d9d779ff53 (diff)
DEV-50468 ??? (???) shown in create group window under members by default
-rw-r--r--indra/newview/llnamelistctrl.cpp7
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;