diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-12 08:20:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-12 08:20:00 +0000 |
| commit | 276e80ce367dd89d7f3b2882ff669d6b59b78c0c (patch) | |
| tree | 79cc5cc69281cd89c668e3b9941cc7d92d53445f /indra/newview/lltoastgroupnotifypanel.cpp | |
| parent | c2ddcfae49bb1b4794facd64de1c2ac62fdb5715 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1967 https://svn.aws.productengine.com/secondlife/pe/stable-2@1971 -> viewer-2.0.0-3
* Bugs: EXT-1431 EXT-1237 EXT-1151 EXT-1165 EXT-1410 EXT-1419
* Dev: EXT-1232
Diffstat (limited to 'indra/newview/lltoastgroupnotifypanel.cpp')
| -rw-r--r-- | indra/newview/lltoastgroupnotifypanel.cpp | 13 |
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)); |