livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-11835 FIXED [EEP] Environment settings are shown with general 'object' icon in Inventory

master
maxim_productengine 2019-08-29 11:26:43 +03:00
parent c5724023dd
commit 2f50f4ffa3
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llinventoryicon.cpp
View File

@ -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);
}