diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-08-29 14:56:28 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-08-29 14:56:28 +0000 |
| commit | cccb63e8240e18e04f7454475481803a52fd6209 (patch) | |
| tree | bbe0d18a8aa14347e5b2437e6f29c65deae1bdb0 /indra/newview | |
| parent | 82d976a110b429a244337c6acbb0196636460034 (diff) | |
| parent | 2f50f4ffa38be63101c3754f62e0413bb8fcd248 (diff) | |
Merged in maxim_productengine/viewer-eep (pull request #491)
SL-11835 FIXED [EEP] Environment settings are shown with general 'object' icon in Inventory
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventoryicon.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp index 3bf5117c26..81c001b8bd 100644 --- a/indra/newview/llinventoryicon.cpp +++ b/indra/newview/llinventoryicon.cpp @@ -174,6 +174,9 @@ const std::string& LLInventoryIcon::getIconName(LLAssetType::EType asset_type, break; case LLAssetType::AT_MESH: idx = LLInventoryType::ICONNAME_MESH; + case LLAssetType::AT_SETTINGS: + idx = assignSettingsIcon(misc_flag); + break; case LLAssetType::AT_UNKNOWN: idx = LLInventoryType::ICONNAME_UNKNOWN; default: @@ -195,3 +198,9 @@ 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); +} |