diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-24 23:52:49 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-24 23:52:49 -0500 |
| commit | cd9d1685e952c762c55aee62c1e8c98ae7e26f68 (patch) | |
| tree | 4852dd56a25b1f64e90500ac5b8c7023cda7bfb6 /indra/newview | |
| parent | 36f25e43a9f9aca6625a8ead6fadf58261a6a937 (diff) | |
| parent | 35c81f75ac9c134052debb21f6467012859a1fc6 (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/llinventoryicon.cpp | 3 | ||||
| -rwxr-xr-x | indra/newview/llinventoryicon.h | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Inv_Mesh.png | bin | 0 -> 3263 bytes |
4 files changed, 5 insertions, 1 deletions
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 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>RenderHideGroupTitle</key> <map> 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 Binary files differnew file mode 100644 index 0000000000..f1f21f7941 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_Mesh.png |
