summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryfunctions.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-01 18:03:43 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-01 18:03:43 +0100
commite562a200b69c39f60540019ef0ec7423ace04bef (patch)
treed7f501eeb7f104243c7a094b62f0b7728056f8f8 /indra/newview/llinventoryfunctions.cpp
parentab79bf7aaeaa0cbd7b2571601971cce97f9b4acd (diff)
parentbb4836f53d98d987a1702f970d4b853eaa529907 (diff)
merge from viewer-trunk
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
-rw-r--r--indra/newview/llinventoryfunctions.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 3e16dfea5f..56de7cc771 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -538,6 +538,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;
}