From 3bd1202dbe62619328763a7740fdb1d17e2767b4 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Mon, 17 Nov 2025 16:01:28 +0000
Subject: [PATCH] Fix enum type arithmetic deprecation warnings

---
 indra/llprimitive/lldaeloader.cpp   | 8 +++++++-
 indra/newview/gltf/llgltfloader.cpp | 9 +++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index afcbafd249..9b8ce58cbd 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -1131,7 +1131,13 @@ bool LLDAELoader::OpenFile(const std::string& filename)
                 LLModel* mdl = *i;
                 if(mdl->getStatus() != LLModel::NO_ERRORS)
                 {
-                    setLoadState(ERROR_MODEL + mdl->getStatus()) ;
+                    // <FS:Beq> Fix deprecated arithmetic between different enum types (ERROR_MODEL + EModelStatus)
+                    // Ugly fix. could use a helper instead but its only called in two places.
+                    // setLoadState(ERROR_MODEL + mdl->getStatus());
+                    setLoadState(
+                        static_cast<LLModelLoader::eLoadState>(
+                                 static_cast<S32>(ERROR_MODEL) + static_cast<S32>(mdl->getStatus())));
+                    // </FS:Beq>
                     return false; //abort
                 }
 
diff --git a/indra/newview/gltf/llgltfloader.cpp b/indra/newview/gltf/llgltfloader.cpp
index ce0e3b4d16..ac0f211294 100644
--- a/indra/newview/gltf/llgltfloader.cpp
+++ b/indra/newview/gltf/llgltfloader.cpp
@@ -486,8 +486,13 @@ void LLGLTFLoader::processNodeHierarchy(S32 node_idx, std::map<std::string, S32>
         }
         else
         {
-            setLoadState(ERROR_MODEL + pModel->getStatus());
-            delete pModel;
+            // <FS:Beq> Fix deprecated arithmetic between different enum types (ERROR_MODEL + EModelStatus)
+            // Ugly fix. could use a helper instead but its only called in two places.
+            // setLoadState(ERROR_MODEL + pModel->getStatus());
+            setLoadState(
+                static_cast<LLModelLoader::eLoadState>(
+                            static_cast<S32>(ERROR_MODEL) + static_cast<S32>(mdl->getStatus())));
+            // </FS:Beq>            delete pModel;
             return;
         }
     }