summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryicon.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2018-09-27 13:09:04 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2018-09-27 13:09:04 +0300
commit4745de5f4b856146983cee5f50e78d051a9f6079 (patch)
tree2994a19d27eba1851f97ccf0cc0ab7e70a7b64a9 /indra/newview/llinventoryicon.cpp
parentd53011a6420eab9b32d55604272db02b3c238389 (diff)
parent58aef8beaf79dc83546a7b080014ca5030733ac8 (diff)
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llinventoryicon.cpp')
-rw-r--r--indra/newview/llinventoryicon.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp
index 495180f087..d0df1c94d5 100644
--- a/indra/newview/llinventoryicon.cpp
+++ b/indra/newview/llinventoryicon.cpp
@@ -93,6 +93,7 @@ LLIconDictionary::LLIconDictionary()
addEntry(LLInventoryType::ICONNAME_MESH, new IconEntry("Inv_Mesh"));
addEntry(LLInventoryType::ICONNAME_INVALID, new IconEntry("Inv_Invalid"));
+ addEntry(LLInventoryType::ICONNAME_UNKNOWN, new IconEntry("Inv_Unknown"));
addEntry(LLInventoryType::ICONNAME_NONE, new IconEntry("NONE"));
}
@@ -166,6 +167,8 @@ const std::string& LLInventoryIcon::getIconName(LLAssetType::EType asset_type,
break;
case LLAssetType::AT_MESH:
idx = LLInventoryType::ICONNAME_MESH;
+ case LLAssetType::AT_UNKNOWN:
+ idx = LLInventoryType::ICONNAME_UNKNOWN;
default:
break;
}