diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-24 18:39:19 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-24 18:39:19 -0400 |
commit | 9afa752ca13d45a3d93d66e9b01fea3969365228 (patch) | |
tree | 1910f810750f24ce8cc46aa0802ae9a2b114c783 /indra/newview/llinventoryicon.cpp | |
parent | e677e5e77114cfbfcd7c5e838922fdf8d12853fb (diff) | |
parent | e5752934be74a84e6ec0ff8cb96974bd1e9060ec (diff) |
merged .hgtags
Diffstat (limited to 'indra/newview/llinventoryicon.cpp')
-rw-r--r-- | indra/newview/llinventoryicon.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp index 95dea219a8..34734d57c5 100644 --- a/indra/newview/llinventoryicon.cpp +++ b/indra/newview/llinventoryicon.cpp @@ -86,6 +86,7 @@ LLIconDictionary::LLIconDictionary() addEntry(LLInventoryIcon::ICONNAME_LINKITEM, new IconEntry("Inv_LinkItem")); addEntry(LLInventoryIcon::ICONNAME_LINKFOLDER, new IconEntry("Inv_LinkFolder")); + addEntry(LLInventoryIcon::ICONNAME_MESH, new IconEntry("Inv_Mesh")); addEntry(LLInventoryIcon::ICONNAME_INVALID, new IconEntry("Inv_Invalid")); @@ -159,6 +160,8 @@ const std::string& LLInventoryIcon::getIconName(LLAssetType::EType asset_type, case LLAssetType::AT_OBJECT: idx = ICONNAME_OBJECT; break; + case LLAssetType::AT_MESH: + idx = ICONNAME_MESH; default: break; } |