From 00e95e21f78122c7d5fde7c7174ff8bf6e5770bb Mon Sep 17 00:00:00 2001 From: Beq Date: Mon, 17 Nov 2025 18:26:47 +0000 Subject: [PATCH] Another enum deprecation fix (and fix oopsie) --- indra/newview/gltf/llgltfloader.cpp | 5 +++-- indra/newview/llpaneloutfitedit.cpp | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/indra/newview/gltf/llgltfloader.cpp b/indra/newview/gltf/llgltfloader.cpp index ac0f211294..3ad96c0cb6 100644 --- a/indra/newview/gltf/llgltfloader.cpp +++ b/indra/newview/gltf/llgltfloader.cpp @@ -491,8 +491,9 @@ void LLGLTFLoader::processNodeHierarchy(S32 node_idx, std::map // setLoadState(ERROR_MODEL + pModel->getStatus()); setLoadState( static_cast( - static_cast(ERROR_MODEL) + static_cast(mdl->getStatus()))); - // delete pModel; + static_cast(ERROR_MODEL) + static_cast(pModel->getStatus()))); + // + delete pModel; return; } } diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index e621f16a84..f72ad8cfbb 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -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(LVIT_SHAPE + type)); + // More deprecated enum math + // applyListViewFilter(static_cast(LVIT_SHAPE + type)); + applyListViewFilter(static_cast(static_cast(LVIT_SHAPE) + static_cast(type))); + // mWearableItemsList->setMenuWearableType(type); }