diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-01-29 13:06:36 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-01-29 13:06:36 +0200 |
| commit | 4c2dbe93635f0c25c347e4fe7152b78733697cdf (patch) | |
| tree | 3991c33d46ee862c20b672b2c5e57768cb7a866b /indra/newview/lltoastgroupnotifypanel.cpp | |
| parent | aea3d79be74210d537cb9f9afc54a4f2e240bc99 (diff) | |
| parent | 8a7ca61479813f55481f1040f75cd6fc63e713d2 (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltoastgroupnotifypanel.cpp')
| -rw-r--r-- | indra/newview/lltoastgroupnotifypanel.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/indra/newview/lltoastgroupnotifypanel.cpp b/indra/newview/lltoastgroupnotifypanel.cpp index e49044cdca..add61c00cf 100644 --- a/indra/newview/lltoastgroupnotifypanel.cpp +++ b/indra/newview/lltoastgroupnotifypanel.cpp @@ -127,17 +127,7 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification pAttachLink->setVisible(hasInventory); pAttachIcon->setVisible(hasInventory); if (hasInventory) { - 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); - } + pAttachLink->setValue(payload["inventory_name"]); mInventoryOffer = new LLOfferInfo(payload["inventory_offer"]); childSetActionTextbox("attachment", boost::bind( |