diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-08-27 16:52:22 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-08-27 16:52:22 +0000 |
| commit | 3fe7577f5ba15477ef65637ca159e5ff92dcbade (patch) | |
| tree | 6bdf032f23906235b6c7d85554e193d5b7c56165 /indra/newview/llinventoryicon.cpp | |
| parent | f79fc96d08e37f119653f7db5a299a05454ff79c (diff) | |
| parent | 2cd01c8e92e2ecf4402a3a075ec8bdc6a8f20470 (diff) | |
Merged in graham_linden/viewer-eep-g (pull request #486)
Default
Diffstat (limited to 'indra/newview/llinventoryicon.cpp')
| -rw-r--r-- | indra/newview/llinventoryicon.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp index 323d19b68a..3bf5117c26 100644 --- a/indra/newview/llinventoryicon.cpp +++ b/indra/newview/llinventoryicon.cpp @@ -84,6 +84,7 @@ LLIconDictionary::LLIconDictionary() addEntry(LLInventoryType::ICONNAME_CLOTHING_SKIRT, new IconEntry("Inv_Skirt")); addEntry(LLInventoryType::ICONNAME_CLOTHING_ALPHA, new IconEntry("Inv_Alpha")); addEntry(LLInventoryType::ICONNAME_CLOTHING_TATTOO, new IconEntry("Inv_Tattoo")); + addEntry(LLInventoryType::ICONNAME_CLOTHING_UNIVERSAL, new IconEntry("Inv_Universal")); addEntry(LLInventoryType::ICONNAME_ANIMATION, new IconEntry("Inv_Animation")); addEntry(LLInventoryType::ICONNAME_GESTURE, new IconEntry("Inv_Gesture")); @@ -173,14 +174,8 @@ const std::string& LLInventoryIcon::getIconName(LLAssetType::EType asset_type, break; case LLAssetType::AT_MESH: idx = LLInventoryType::ICONNAME_MESH; - break; - case LLAssetType::AT_SETTINGS: - // TODO: distinguish between Sky and Water settings. - idx = assignSettingsIcon(misc_flag); - break; case LLAssetType::AT_UNKNOWN: idx = LLInventoryType::ICONNAME_UNKNOWN; - break; default: break; } @@ -200,9 +195,3 @@ LLInventoryType::EIconName LLInventoryIcon::assignWearableIcon(U32 misc_flag) const LLWearableType::EType wearable_type = LLWearableType::inventoryFlagsToWearableType(misc_flag); return LLWearableType::getIconName(wearable_type); } - -LLInventoryType::EIconName LLInventoryIcon::assignSettingsIcon(U32 misc_flag) -{ - LLSettingsType::type_e settings_type = LLSettingsType::fromInventoryFlags(misc_flag); - return LLSettingsType::getIconName(settings_type); -} |