diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-05-11 17:21:29 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-05-11 17:21:29 -0700 |
| commit | 45dcce5fdcfe09a19870f44c6667c63b48b10cee (patch) | |
| tree | 7d2cd8b6824af5036618429e795742cff374a489 /indra/newview/llpanelgroupnotices.cpp | |
| parent | 42b9c4644d7b6a8bf32871f849cef6ae73e1320f (diff) | |
| parent | cec79c7ae133b91288fc4e58329d82cd2463efd5 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelgroupnotices.cpp')
| -rw-r--r-- | indra/newview/llpanelgroupnotices.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp index edc29bb6a0..362d8581f3 100644 --- a/indra/newview/llpanelgroupnotices.cpp +++ b/indra/newview/llpanelgroupnotices.cpp @@ -338,6 +338,7 @@ void LLPanelGroupNotices::setItem(LLPointer<LLInventoryItem> inv_item) std::string icon_name = LLInventoryIcon::getIconName(inv_item->getType(), inv_item->getInventoryType(), inv_item->getFlags(), + inv_item->getIsLinkType(), item_is_multi ); mCreateInventoryIcon->setValue(icon_name); @@ -554,7 +555,7 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg) { std::string icon_name = LLInventoryIcon::getIconName( (LLAssetType::EType)asset_type, - LLInventoryType::IT_NONE,FALSE, FALSE); + LLInventoryType::IT_NONE); row["columns"][0]["type"] = "icon"; row["columns"][0]["value"] = icon_name; } @@ -621,8 +622,7 @@ void LLPanelGroupNotices::showNotice(const std::string& subject, mInventoryOffer = inventory_offer; std::string icon_name = LLInventoryIcon::getIconName(mInventoryOffer->mType, - LLInventoryType::IT_TEXTURE, - 0, FALSE); + LLInventoryType::IT_TEXTURE); mViewInventoryIcon->setValue(icon_name); mViewInventoryIcon->setVisible(TRUE); |