diff options
| author | Palmer <palmer@lindenlab.com> | 2009-11-12 14:05:30 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-11-12 14:05:30 -0800 |
| commit | a1f6391d7d63b8eef540c29eebc2786eec8c755f (patch) | |
| tree | 146eb66419f8b28dcb810f044077306d7c9cb5ff /indra/newview | |
| parent | 596d3cfb6018789e3ffca5bf3ae9fa4e1e8a707a (diff) | |
| parent | bb72788392ea6d25adb045abd555419cd60c4888 (diff) | |
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/render-pipeline/
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 75218e98e0..01c7f0974d 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -323,6 +323,9 @@ const std::string& get_item_icon_name(LLAssetType::EType asset_type, case LLAssetType::AT_LINK_FOLDER: idx = LINKFOLDER_ICON_NAME; break; + case LLAssetType::AT_MESH: + idx = MESH_ICON_NAME; + break; default: break; } |