diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-01-27 17:29:44 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-01-27 17:29:44 +0200 |
| commit | 837f6c7cbefa7ac1c64c9506d2fabd640ae652ec (patch) | |
| tree | eb07d97e1e0ccf5bba6913aa11878e9b74d7c5bf /indra/newview/lltoastgroupnotifypanel.cpp | |
| parent | b23a5dda5a730b1d0196d171dc5005e03b2328d4 (diff) | |
Work on major bug EXT-3985 ([BSI] Landmarks created in Viewer 2.0 show up with 1@ in Viewer 1.23.x)
-- Implemented storage to save favorite landmarks order in local file.
-- Previously implemented solution to store sort index in Landmark's name replaced with using the storage.
For now all landmarks are shown as is (with sort LM prefix if it exists).
-- Some deprecated methods are marked to be removed later
-- Reverted fixes for: EXT-4306, EXT-1237, EXT-1615 as not necessary, these bugs should be verified again.
--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( |