summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryicon.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-09-24 23:52:32 -0500
committerDave Parks <davep@lindenlab.com>2010-09-24 23:52:32 -0500
commit35c81f75ac9c134052debb21f6467012859a1fc6 (patch)
tree3b79d1b975ec7dc56aa78668282ac8895c675559 /indra/newview/llinventoryicon.cpp
parent3e2eb3ee4fc9321682336edf37d92b0e05958621 (diff)
Fix for bad zipping of meshes and add mesh icon back to repository.
Diffstat (limited to 'indra/newview/llinventoryicon.cpp')
-rwxr-xr-xindra/newview/llinventoryicon.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp
index 2201481df3..ec46ea35af 100755
--- a/indra/newview/llinventoryicon.cpp
+++ b/indra/newview/llinventoryicon.cpp
@@ -90,6 +90,7 @@ LLIconDictionary::LLIconDictionary()
addEntry(LLInventoryIcon::ICONNAME_LINKITEM, new IconEntry("Inv_LinkItem"));
addEntry(LLInventoryIcon::ICONNAME_LINKFOLDER, new IconEntry("Inv_LinkItem"));
+ addEntry(LLInventoryIcon::ICONNAME_MESH, new IconEntry("Inv_Mesh"));
addEntry(LLInventoryIcon::ICONNAME_NONE, new IconEntry("NONE"));
}
@@ -161,6 +162,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;
}