From 35c81f75ac9c134052debb21f6467012859a1fc6 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Fri, 24 Sep 2010 23:52:32 -0500 Subject: Fix for bad zipping of meshes and add mesh icon back to repository. --- indra/newview/app_settings/settings.xml | 2 +- indra/newview/llinventoryicon.cpp | 3 +++ indra/newview/llinventoryicon.h | 1 + indra/newview/skins/default/textures/icons/Inv_Mesh.png | Bin 0 -> 3263 bytes 4 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 indra/newview/skins/default/textures/icons/Inv_Mesh.png (limited to 'indra/newview') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 96d2fd05e5..6ab232dd7c 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8017,7 +8017,7 @@ Type Boolean Value - 1 + 0 RenderHideGroupTitle 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; } diff --git a/indra/newview/llinventoryicon.h b/indra/newview/llinventoryicon.h index 6e29012c4c..dc4491e7bf 100755 --- a/indra/newview/llinventoryicon.h +++ b/indra/newview/llinventoryicon.h @@ -78,6 +78,7 @@ public: ICONNAME_LINKITEM, ICONNAME_LINKFOLDER, + ICONNAME_MESH, ICONNAME_COUNT, diff --git a/indra/newview/skins/default/textures/icons/Inv_Mesh.png b/indra/newview/skins/default/textures/icons/Inv_Mesh.png new file mode 100644 index 0000000000..f1f21f7941 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_Mesh.png differ -- cgit v1.2.3