Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[EEP] II_FLAGS_WEARABLES_MASK -> II_FLAGS_SUBTYPE_MASK

Browse Source
This commit is contained in:
Lirusaito
2019-03-24 21:19:55 -04:00
parent 9ccb015411
commit 9affd767e4
8 changed files with 42 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llinventoryicon.cpp
View File

@@ -193,13 +193,13 @@ const std::string& LLInventoryIcon::getIconName(LLInventoryType::EIconName idx)
LLInventoryType::EIconName LLInventoryIcon::assignWearableIcon(U32 misc_flag)
{
const LLWearableType::EType wearable_type = LLWearableType::EType(LLInventoryItemFlags::II_FLAGS_WEARABLES_MASK & misc_flag);
const LLWearableType::EType wearable_type = LLWearableType::EType(LLInventoryItemFlags::II_FLAGS_SUBTYPE_MASK & misc_flag);
return LLWearableType::getIconName(wearable_type);
}
LLInventoryType::EIconName LLInventoryIcon::assignSettingsIcon(U32 misc_flag)
{
switch (misc_flag & LLInventoryItemFlags::II_FLAGS_WEARABLES_MASK)
switch (misc_flag & LLInventoryItemFlags::II_FLAGS_SUBTYPE_MASK)
{
case 0: return LLInventoryType::ICONNAME_SETTINGS_SKY;
case 1: return LLInventoryType::ICONNAME_SETTINGS_WATER;