diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-13 17:30:42 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-13 17:30:42 -0700 |
| commit | 99c115696fadfd4197d93b9b1b6cfb2d0ffb14c5 (patch) | |
| tree | 857e9b14bcdd8822a6fdd3c964602cc5adb2152c /indra/newview/llfloaterbuycontents.cpp | |
| parent | 2af4875309450fa3d3e266426ada12330489a8c9 (diff) | |
| parent | 669953f6950000821c33e77d4c29ef0c905667f9 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterbuycontents.cpp')
| -rw-r--r-- | indra/newview/llfloaterbuycontents.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llfloaterbuycontents.cpp b/indra/newview/llfloaterbuycontents.cpp index 1d989ad0fd..c35653178a 100644 --- a/indra/newview/llfloaterbuycontents.cpp +++ b/indra/newview/llfloaterbuycontents.cpp @@ -48,7 +48,7 @@ #include "llinventoryfunctions.h" #include "llinventorymodel.h" // for gInventory #include "llfloaterreg.h" -#include "llfloaterinventory.h" // for get_item_icon +#include "llfloaterinventory.h" // for LLInventoryIcon::getIcon #include "llnotificationsutil.h" #include "llselectmgr.h" #include "llscrolllistctrl.h" @@ -221,8 +221,9 @@ void LLFloaterBuyContents::inventoryChanged(LLViewerObject* obj, item_is_multi = TRUE; } - std::string icon_name = get_item_icon_name(inv_item->getType(), + 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"; |