diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-04 09:14:58 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-04 09:14:58 -0500 |
| commit | efa42a6aab6d3ada198072c0e2be2b7d9b4e1eb5 (patch) | |
| tree | 39a949e1570c3524c8560522b693328fc7d9afbf /indra/newview/llpanelgroupnotices.cpp | |
| parent | eed7b7201188e01a452c7f4c511c0cb157dc7a5f (diff) | |
| parent | 7549df0eaf347e9f490f9cfaf4950dd623a08237 (diff) | |
merge up to viewer-development
Diffstat (limited to 'indra/newview/llpanelgroupnotices.cpp')
| -rw-r--r-- | indra/newview/llpanelgroupnotices.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp index a24dbf6681..cdf6e51bf8 100644 --- a/indra/newview/llpanelgroupnotices.cpp +++ b/indra/newview/llpanelgroupnotices.cpp @@ -30,6 +30,7 @@ #include "llview.h" +#include "llavatarnamecache.h" #include "llinventory.h" #include "llviewerinventory.h" #include "llinventorydefines.h" @@ -540,6 +541,12 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg) msg->getU8("Data","AssetType",asset_type,i); msg->getU32("Data","Timestamp",timestamp,i); + // we only have the legacy name here, convert it to a username + if (LLAvatarNameCache::useDisplayNames()) + { + name = LLCacheName::buildUsername(name); + } + LLSD row; row["id"] = id; |