summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-06-14 23:14:14 -0500
committerDave Parks <davep@lindenlab.com>2010-06-14 23:14:14 -0500
commit1b7b8aa00ea4329243125a1c53c90115ff7d6bfa (patch)
tree5ef154c052e043dbc500c034b4d718c5568643d2 /indra/newview/llinventorybridge.cpp
parent37a8c12bd34b2bd119b50f32d6e081ab59d1f5c4 (diff)
parent6e37ec08f678451a526f34218cb070d117cdf60a (diff)
merge
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r--indra/newview/llinventorybridge.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index a7d4880664..7859c2b30d 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4807,7 +4807,7 @@ void LLLinkItemBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
LLUIImagePtr LLMeshBridge::getIcon() const
{
- return get_item_icon(LLAssetType::AT_MESH, LLInventoryType::IT_MESH, 0, FALSE);
+ return LLInventoryIcon::getIcon(LLAssetType::AT_MESH, LLInventoryType::IT_MESH, 0, FALSE);
}
void LLMeshBridge::openItem()