summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelgroupnotices.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-06-03 14:15:11 -0700
committerRichard Linden <none@none>2010-06-03 14:15:11 -0700
commitf79ac664dd6eead75368ced40110b6f0474aa92e (patch)
treeb24c616c96d32e0b20c5dd0a217701922f884ee6 /indra/newview/llpanelgroupnotices.cpp
parente2b8c1c699f75e234776beda939205a247fb1bc3 (diff)
parent56e0d59ebcc98515c24f7706569b6e7362981432 (diff)
merge
Diffstat (limited to 'indra/newview/llpanelgroupnotices.cpp')
-rw-r--r--indra/newview/llpanelgroupnotices.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index 42ff514f09..4e8f0b5448 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -36,6 +36,7 @@
#include "llview.h"
+#include "llavatarnamecache.h"
#include "llinventory.h"
#include "llviewerinventory.h"
#include "llinventorydefines.h"
@@ -547,6 +548,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;