summaryrefslogtreecommitdiff
path: root/indra/newview/lltoastgroupnotifypanel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/lltoastgroupnotifypanel.cpp')
-rw-r--r--indra/newview/lltoastgroupnotifypanel.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/lltoastgroupnotifypanel.cpp b/indra/newview/lltoastgroupnotifypanel.cpp
index 6f373a74bd..e26a0776ff 100644
--- a/indra/newview/lltoastgroupnotifypanel.cpp
+++ b/indra/newview/lltoastgroupnotifypanel.cpp
@@ -128,7 +128,18 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification
pAttachLink->setVisible(hasInventory);
pAttachIcon->setVisible(hasInventory);
if (hasInventory) {
- pAttachLink->setValue(payload["inventory_name"]);
+ std::string dis_name;
+ std::string inv_name = payload["inventory_name"];
+
+ if (LLViewerInventoryItem::extractSortFieldAndDisplayName(inv_name, NULL, &dis_name))
+ {
+ pAttachLink->setValue(dis_name);
+ }
+ else
+ {
+ pAttachLink->setValue(inv_name);
+ }
+
mInventoryOffer = new LLOfferInfo(payload["inventory_offer"]);
childSetActionTextbox("attachment", boost::bind(
&LLToastGroupNotifyPanel::onClickAttachment, this));