diff options
| author | James Cook <james@lindenlab.com> | 2010-05-27 18:09:16 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-27 18:09:16 -0700 |
| commit | b999b6cc82eb59756fb1a5908154a218b9b49041 (patch) | |
| tree | 33d9e0a11560b5531854bcdad90555562e67fd64 | |
| parent | 00e8b3548c931991d784f6f14c80ca29528a206d (diff) | |
| parent | 9bb097000cdd38f3af5152ba81731ff093865ffe (diff) | |
merge
| -rw-r--r-- | indra/newview/llpanelgroupnotices.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/lltoastgroupnotifypanel.cpp | 7 |
2 files changed, 11 insertions, 3 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; diff --git a/indra/newview/lltoastgroupnotifypanel.cpp b/indra/newview/lltoastgroupnotifypanel.cpp index 7eac3867d5..ab4071110e 100644 --- a/indra/newview/lltoastgroupnotifypanel.cpp +++ b/indra/newview/lltoastgroupnotifypanel.cpp @@ -42,6 +42,7 @@ #include "llnotifications.h" #include "llviewertexteditor.h" +#include "llavatarnamecache.h" #include "lluiconstants.h" #include "llui.h" #include "llviewercontrol.h" @@ -73,7 +74,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"); |