diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-05-11 17:43:00 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-05-11 17:43:00 -0400 |
| commit | 35bf78478cdd479d8b87a9cc5afa36de92e0ef7e (patch) | |
| tree | 3ddb31143e9dfecb0b3656acb3edc45b8d42b89f /indra/newview/llfloaterbuy.cpp | |
| parent | 37dc96ccdde6263188ffc4f620492a4bb2017761 (diff) | |
EXT-7306 : FIXED : Add shortcut-style icons for inventory links
EXT-7312 : FIXED : INFRASTRUCTURE : Cleanup LLPanelObjectInventory
Fixed a few minor bugs with LLInventoryIcon being called with incorrect arguments.
Big cleanup of LLPanelobjectInventory to make better use of inheritance.
Added LLInventoryIcon class and did some major refactoring for how it determines inventory icons from item bridges.
Diffstat (limited to 'indra/newview/llfloaterbuy.cpp')
| -rw-r--r-- | indra/newview/llfloaterbuy.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterbuy.cpp b/indra/newview/llfloaterbuy.cpp index 8e7bdba848..46b3695511 100644 --- a/indra/newview/llfloaterbuy.cpp +++ b/indra/newview/llfloaterbuy.cpp @@ -153,8 +153,7 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info) // Compute icon for this item std::string icon_name = LLInventoryIcon::getIconName(LLAssetType::AT_OBJECT, - LLInventoryType::IT_OBJECT, - 0x0, FALSE); + LLInventoryType::IT_OBJECT); row["columns"][0]["column"] = "icon"; row["columns"][0]["type"] = "icon"; @@ -255,6 +254,7 @@ void LLFloaterBuy::inventoryChanged(LLViewerObject* obj, std::string icon_name = LLInventoryIcon::getIconName(inv_item->getType(), inv_item->getInventoryType(), + inv_item->getIsLinkType(), inv_item->getFlags(), item_is_multi); row["columns"][0]["column"] = "icon"; |