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

Another enum deprecation fix (and fix oopsie)

master
Beq 2025-11-17 18:26:47 +00:00
parent 869c42e2a9
commit 00e95e21f7
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/gltf/llgltfloader.cpp
View File

@ -491,8 +491,9 @@ void LLGLTFLoader::processNodeHierarchy(S32 node_idx, std::map<std::string, S32>
// setLoadState(ERROR_MODEL + pModel->getStatus());
setLoadState(
static_cast<LLModelLoader::eLoadState>(
static_cast<S32>(ERROR_MODEL) + static_cast<S32>(mdl->getStatus())));
// </FS:Beq> delete pModel;
static_cast<S32>(ERROR_MODEL) + static_cast<S32>(pModel->getStatus())));
// </FS:Beq>
delete pModel;
return;
}
}

5
indra/newview/llpaneloutfitedit.cpp
View File

@ -1324,7 +1324,10 @@ void LLPanelOutfitEdit::showFilteredWearablesListView(LLWearableType::EType type
showWearablesListView();
//e_list_view_item_type implicitly contains LLWearableType::EType starting from LVIT_SHAPE
applyListViewFilter(static_cast<EListViewItemType>(LVIT_SHAPE + type));
// <FS:Beq> More deprecated enum math
// applyListViewFilter(static_cast<EListViewItemType>(LVIT_SHAPE + type));
applyListViewFilter(static_cast<EListViewItemType>(static_cast<S32>(LVIT_SHAPE) + static_cast<S32>(type)));
// </FS:Beq>
mWearableItemsList->setMenuWearableType(type);
}