diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-06-08 17:34:38 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-06-08 17:34:38 -0500 |
| commit | fbe9f07f178cb4b868ff87a5fd370d8ad392d810 (patch) | |
| tree | cd3620fdd9ef15c8cdf87f692a8000fa9f37e447 /indra/newview/llinventorybridge.cpp | |
| parent | 22102e41cbf4ce9e1c0d069f111849466e297520 (diff) | |
Merge fix.
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 78789eb9ce..97d51a9d90 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4849,7 +4849,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() |