diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-27 15:49:22 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-27 15:49:22 -0700 |
| commit | 9bb097000cdd38f3af5152ba81731ff093865ffe (patch) | |
| tree | 99bc42e005c157a7b0a1b7c0f211242e7531de6c /indra/newview/llpanelgroupnotices.cpp | |
| parent | fee7b15417d2bb1374ec9f861db77e51cbca7fe5 (diff) | |
update group notice panel and group notice to optionally use username if using display names
Diffstat (limited to 'indra/newview/llpanelgroupnotices.cpp')
| -rw-r--r-- | indra/newview/llpanelgroupnotices.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp index b71ece2be3..4e8f0b5448 100644 --- a/indra/newview/llpanelgroupnotices.cpp +++ b/indra/newview/llpanelgroupnotices.cpp @@ -36,7 +36,7 @@ #include "llview.h" -#include "llcachename.h" +#include "llavatarnamecache.h" #include "llinventory.h" #include "llviewerinventory.h" #include "llinventorydefines.h" @@ -549,7 +549,10 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg) msg->getU32("Data","Timestamp",timestamp,i); // we only have the legacy name here, convert it to a username - name = LLCacheName::buildUsername(name); + if (LLAvatarNameCache::useDisplayNames()) + { + name = LLCacheName::buildUsername(name); + } LLSD row; row["id"] = id; |