diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-09-03 17:41:39 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-09-03 17:41:39 +0100 |
| commit | ffae589843c2977ae7f70de78d84c936e2a91291 (patch) | |
| tree | 497660a88fe55382639dea1b2f3499241127470d /indra/newview/lltoastgroupnotifypanel.cpp | |
| parent | 63f2ddf377fa0fc6a666cdc1001289335d86258b (diff) | |
| parent | 25c29d59cf658acec5901c6f06775add10cf0bfd (diff) | |
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
Diffstat (limited to 'indra/newview/lltoastgroupnotifypanel.cpp')
| -rw-r--r-- | indra/newview/lltoastgroupnotifypanel.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/lltoastgroupnotifypanel.cpp b/indra/newview/lltoastgroupnotifypanel.cpp index 4c75b07ae8..da81c9634d 100644 --- a/indra/newview/lltoastgroupnotifypanel.cpp +++ b/indra/newview/lltoastgroupnotifypanel.cpp @@ -36,6 +36,7 @@ #include "llnotifications.h" #include "llviewertexteditor.h" +#include "llavatarnamecache.h" #include "lluiconstants.h" #include "llui.h" #include "llviewercontrol.h" @@ -67,7 +68,11 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification pGroupIcon->setValue(groupData.mInsigniaID); //header title - const std::string& from_name = payload["sender_name"].asString(); + std::string from_name = payload["sender_name"].asString(); + if (LLAvatarNameCache::useDisplayNames()) + { + from_name = LLCacheName::buildUsername(from_name); + } std::stringstream from; from << from_name << "/" << groupData.mName; LLTextBox* pTitleText = getChild<LLTextBox>("title"); |